Refactor STT adapters

owhisper/owhisper-client/src/adapter/argmax/batch.rs

@@ -0,0 +1,20 @@
+use std::path::Path;
+
+use owhisper_interface::ListenParams;
+
+use super::ArgmaxAdapter;
+use crate::adapter::{BatchFuture, BatchSttAdapter};
+
+impl BatchSttAdapter for ArgmaxAdapter {
+    fn transcribe_file<'a, P: AsRef<Path> + Send + 'a>(
+        &'a self,
+        client: &'a reqwest::Client,
+        api_base: &'a str,
+        api_key: &'a str,
+        params: &'a ListenParams,
+        file_path: P,
+    ) -> BatchFuture<'a> {
+        self.inner
+            .transcribe_file(client, api_base, api_key, params, file_path)
+    }
+}

owhisper/owhisper-client/src/adapter/argmax.rs → owhisper/owhisper-client/src/adapter/argmax/live.rs

@@ -1,49 +1,11 @@
-use std::path::Path;
-
 use hypr_ws::client::Message;
 use owhisper_interface::stream::StreamResponse;
 use owhisper_interface::ListenParams;
 
-use super::{BatchFuture, DeepgramAdapter, SttAdapter};
-
-const PARAKEET_V3_LANGS: &[&str] = &[
-    "bg", "cs", "da", "de", "el", "en", "es", "et", "fi", "fr", "hr", "hu", "it", "lt", "lv", "mt",
-    "nl", "pl", "pt", "ro", "ru", "sk", "sl", "sv", "uk",
-];
-
-#[derive(Clone, Default)]
-pub struct ArgmaxAdapter {
-    inner: DeepgramAdapter,
-}
-
-impl ArgmaxAdapter {
-    fn adapt_params(params: &ListenParams) -> ListenParams {
-        let mut adapted = params.clone();
-        let model = params.model.as_deref().unwrap_or("");
-
-        let lang = if model.contains("parakeet") && model.contains("v2") {
-            hypr_language::ISO639::En.into()
-        } else if model.contains("parakeet") && model.contains("v3") {
-            params
-                .languages
-                .iter()
-                .find(|lang| PARAKEET_V3_LANGS.contains(&lang.iso639().code()))
-                .cloned()
-                .unwrap_or_else(|| hypr_language::ISO639::En.into())
-        } else {
-            params
-                .languages
-                .first()
-                .cloned()
-                .unwrap_or_else(|| hypr_language::ISO639::En.into())
-        };
+use super::ArgmaxAdapter;
+use crate::adapter::RealtimeSttAdapter;
 
-        adapted.languages = vec![lang];
-        adapted
-    }
-}
-
-impl SttAdapter for ArgmaxAdapter {
+impl RealtimeSttAdapter for ArgmaxAdapter {
     fn supports_native_multichannel(&self) -> bool {
         false
     }
@@ -68,18 +30,6 @@ impl SttAdapter for ArgmaxAdapter {
     fn parse_response(&self, raw: &str) -> Option<StreamResponse> {
         self.inner.parse_response(raw)
     }
-
-    fn transcribe_file<'a, P: AsRef<Path> + Send + 'a>(
-        &'a self,
-        client: &'a reqwest::Client,
-        api_base: &'a str,
-        api_key: &'a str,
-        params: &'a ListenParams,
-        file_path: P,
-    ) -> BatchFuture<'a> {
-        self.inner
-            .transcribe_file(client, api_base, api_key, params, file_path)
-    }
 }
 
 #[cfg(test)]

owhisper/owhisper-client/src/adapter/argmax/mod.rs

@@ -0,0 +1,43 @@
+mod batch;
+mod live;
+
+use owhisper_interface::ListenParams;
+
+use super::DeepgramAdapter;
+
+const PARAKEET_V3_LANGS: &[&str] = &[
+    "bg", "cs", "da", "de", "el", "en", "es", "et", "fi", "fr", "hr", "hu", "it", "lt", "lv", "mt",
+    "nl", "pl", "pt", "ro", "ru", "sk", "sl", "sv", "uk",
+];
+
+#[derive(Clone, Default)]
+pub struct ArgmaxAdapter {
+    inner: DeepgramAdapter,
+}
+
+impl ArgmaxAdapter {
+    pub(crate) fn adapt_params(params: &ListenParams) -> ListenParams {
+        let mut adapted = params.clone();
+        let model = params.model.as_deref().unwrap_or("");
+
+        let lang = if model.contains("parakeet") && model.contains("v2") {
+            hypr_language::ISO639::En.into()
+        } else if model.contains("parakeet") && model.contains("v3") {
+            params
+                .languages
+                .iter()
+                .find(|lang| PARAKEET_V3_LANGS.contains(&lang.iso639().code()))
+                .cloned()
+                .unwrap_or_else(|| hypr_language::ISO639::En.into())
+        } else {
+            params
+                .languages
+                .first()
+                .cloned()
+                .unwrap_or_else(|| hypr_language::ISO639::En.into())
+        };
+
+        adapted.languages = vec![lang];
+        adapted
+    }
+}