Major quality pass on top of Phase 2. Five substantive changes plus
cross-cutting touches across audio, hotkey, transcription, and Tauri
command layers.
Transcription quality
- Long-audio chunking in commands/transcription.rs: Parakeet and large
file transcription now chunk-and-recompose with overlap trimming, so
the live-path chunking advantage extends to file-based workflows.
- Stateful live speech gate in commands/live.rs on top of the earlier
duplicate-boundary filtering — distinguishes start-of-speech from
mid-speech and holds state across chunks.
Auto-learning corrections
- New crates/ai-formatting/src/correction_learning.rs: extracts user
text corrections from viewer edits and proposes additions to the
active profile's vocabulary.
- src-tauri/src/commands/profiles.rs bridge for frontend-driven
confirmation of learned terms.
- src/routes/viewer/+page.svelte hooks the learning path into the
segment-edit flow so corrections feed profile_terms without a
separate 'train this profile' UX.
Transcript profile provenance
- Migration v8 (crates/storage/src/migrations.rs) adds profile_id to
transcripts, defaulting to DEFAULT_PROFILE_ID so existing rows stay
valid.
- crates/storage/src/database.rs: TranscriptRow + CRUD carry profile_id.
- src-tauri/src/commands/transcripts.rs: add_transcript accepts and
persists profile_id.
- DictationPage.svelte + FilesPage.svelte send activeProfileId on
capture so learned corrections are attributed to the right profile.
Cleanup prompt contract
- crates/ai-formatting/src/llm_client.rs hardened: the CLEANUP_PROMPT
now specifies concrete do/do-not rules, ready for a real model-backed
cleanup pass. The llm_client is still a stub — kon-llm remains unwired
— but the prompt shape is final.
Cross-cutting polish
- Minor touches in audio (capture/decode/resample), hotkey (lib/linux/stub),
core, transcription (concurrency/model_manager/local_engine/whisper_rs),
and the rest of src-tauri/src/commands/*: error-path tightening, log
clarity, TS-migration follow-ups (@ts-nocheck additions for incremental
typing).
Verified locally: npm run check, cargo test -p kon-ai-formatting,
cargo test -p kon-storage, cargo test -p kon --lib commands::live::tests,
cargo check — all green.
Scope boundary: kon-llm crate is still a stub; task extraction remains
rule-based. Bundled local-LLM runtime is the next clean step and is not
in this commit.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
190 lines
6.6 KiB
Rust
190 lines
6.6 KiB
Rust
use std::path::Path;
|
|
use std::sync::Mutex;
|
|
use std::time::Instant;
|
|
|
|
use transcribe_rs::{SpeechModel, TranscribeOptions, TranscriptionResult};
|
|
|
|
use kon_core::error::{KonError, Result};
|
|
use kon_core::types::{
|
|
AudioSamples, EngineName, ModelId, Segment, Transcript, TranscriptionOptions,
|
|
};
|
|
|
|
use crate::whisper_rs_backend::WhisperRsBackend;
|
|
|
|
/// Result of a timed transcription: transcript + inference duration.
|
|
pub struct TimedTranscript {
|
|
pub transcript: Transcript,
|
|
pub inference_ms: u64,
|
|
}
|
|
|
|
/// Public discriminator selected by the loaders (`load_parakeet`, `load_whisper`)
|
|
/// and passed to `LocalEngine::load`. `src-tauri::commands::models` names this
|
|
/// type as the return of `load_model_from_disk`, so it must be `pub`.
|
|
pub enum SpeechBackend {
|
|
/// transcribe-rs-owned model. Used for Parakeet ONNX (wrapped in
|
|
/// ParakeetWordGranularity for word-level timestamps).
|
|
Adapter(Box<dyn SpeechModel + Send>),
|
|
/// Direct whisper-rs. The only path that actually forwards `initial_prompt`.
|
|
WhisperRs(WhisperRsBackend),
|
|
}
|
|
|
|
/// Wraps any transcribe-rs engine in Kon's SpeechToText trait.
|
|
/// Encapsulates threading: inference always runs on a blocking thread.
|
|
/// The rest of the app never imports transcribe-rs directly.
|
|
pub struct LocalEngine {
|
|
engine: Mutex<Option<SpeechBackend>>,
|
|
engine_name: EngineName,
|
|
loaded_model_id: Mutex<Option<ModelId>>,
|
|
}
|
|
|
|
impl LocalEngine {
|
|
pub fn new(engine_name: EngineName) -> Self {
|
|
Self {
|
|
engine: Mutex::new(None),
|
|
engine_name,
|
|
loaded_model_id: Mutex::new(None),
|
|
}
|
|
}
|
|
|
|
pub fn load(&self, backend: SpeechBackend, model_id: ModelId) {
|
|
let mut guard = self.engine.lock().unwrap_or_else(|e| e.into_inner());
|
|
*guard = Some(backend);
|
|
let mut id_guard = self
|
|
.loaded_model_id
|
|
.lock()
|
|
.unwrap_or_else(|e| e.into_inner());
|
|
*id_guard = Some(model_id);
|
|
}
|
|
|
|
pub fn name(&self) -> &EngineName {
|
|
&self.engine_name
|
|
}
|
|
|
|
pub fn loaded_model_id(&self) -> Option<ModelId> {
|
|
let guard = self
|
|
.loaded_model_id
|
|
.lock()
|
|
.unwrap_or_else(|e| e.into_inner());
|
|
guard.clone()
|
|
}
|
|
|
|
pub fn is_loaded(&self) -> bool {
|
|
let guard = self.engine.lock().unwrap_or_else(|e| e.into_inner());
|
|
guard.is_some()
|
|
}
|
|
|
|
/// Run transcription synchronously with timing.
|
|
/// Called from within spawn_blocking.
|
|
pub fn transcribe_sync(
|
|
&self,
|
|
audio: &AudioSamples,
|
|
options: &TranscriptionOptions,
|
|
) -> Result<TimedTranscript> {
|
|
let mut guard = self.engine.lock().unwrap_or_else(|e| e.into_inner());
|
|
let backend = guard.as_mut().ok_or(KonError::EngineNotLoaded)?;
|
|
|
|
let start = Instant::now();
|
|
let segments: Vec<Segment> = match backend {
|
|
SpeechBackend::Adapter(model) => {
|
|
let opts = TranscribeOptions {
|
|
language: options.language.clone(),
|
|
translate: false,
|
|
leading_silence_ms: None,
|
|
trailing_silence_ms: None,
|
|
};
|
|
let result: TranscriptionResult = model
|
|
.transcribe(audio.samples(), &opts)
|
|
.map_err(|e| KonError::TranscriptionFailed(e.to_string()))?;
|
|
result
|
|
.segments
|
|
.unwrap_or_default()
|
|
.into_iter()
|
|
.map(|s| Segment {
|
|
start: s.start as f64,
|
|
end: s.end as f64,
|
|
text: s.text,
|
|
})
|
|
.collect()
|
|
}
|
|
SpeechBackend::WhisperRs(w) => w
|
|
.transcribe_sync(audio.samples(), options)
|
|
.map_err(|e| KonError::TranscriptionFailed(e.to_string()))?,
|
|
};
|
|
let inference_ms = start.elapsed().as_millis() as u64;
|
|
|
|
Ok(TimedTranscript {
|
|
transcript: Transcript::new(
|
|
segments,
|
|
options.language.clone().unwrap_or_else(|| "en".to_string()),
|
|
audio.duration_secs(),
|
|
),
|
|
inference_ms,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Thin wrapper over `ParakeetModel` that overrides `transcribe_raw` to
|
|
/// request word-granularity segments. `transcribe-rs` 0.3's trait impl for
|
|
/// `ParakeetModel::transcribe_raw` ignores `TranscribeOptions` and uses
|
|
/// `TimestampGranularity::Token` (per-subword) — which surfaces in Kon as
|
|
/// "T Est Ing . One , Two , Three" output. The concrete-type method
|
|
/// `ParakeetModel::transcribe_with` accepts `ParakeetParams` with an
|
|
/// explicit granularity; this wrapper exposes that to the trait object.
|
|
struct ParakeetWordGranularity(transcribe_rs::onnx::parakeet::ParakeetModel);
|
|
|
|
impl transcribe_rs::SpeechModel for ParakeetWordGranularity {
|
|
fn capabilities(&self) -> transcribe_rs::ModelCapabilities {
|
|
self.0.capabilities()
|
|
}
|
|
|
|
fn default_leading_silence_ms(&self) -> u32 {
|
|
self.0.default_leading_silence_ms()
|
|
}
|
|
|
|
fn default_trailing_silence_ms(&self) -> u32 {
|
|
self.0.default_trailing_silence_ms()
|
|
}
|
|
|
|
fn transcribe_raw(
|
|
&mut self,
|
|
samples: &[f32],
|
|
options: &TranscribeOptions,
|
|
) -> std::result::Result<TranscriptionResult, transcribe_rs::TranscribeError> {
|
|
use transcribe_rs::onnx::parakeet::{ParakeetParams, TimestampGranularity};
|
|
let params = ParakeetParams {
|
|
language: options.language.clone(),
|
|
timestamp_granularity: Some(TimestampGranularity::Word),
|
|
};
|
|
self.0.transcribe_with(samples, ¶ms)
|
|
}
|
|
}
|
|
|
|
/// Load a Parakeet model from a directory path.
|
|
pub fn load_parakeet(model_dir: &Path) -> Result<SpeechBackend> {
|
|
use transcribe_rs::onnx::Quantization;
|
|
let model = transcribe_rs::onnx::parakeet::ParakeetModel::load(model_dir, &Quantization::Int8)
|
|
.map_err(|e| KonError::TranscriptionFailed(format!("Failed to load Parakeet: {e}")))?;
|
|
Ok(SpeechBackend::Adapter(Box::new(ParakeetWordGranularity(
|
|
model,
|
|
))))
|
|
}
|
|
|
|
/// Load a Whisper model from a GGML file path via whisper-rs.
|
|
pub fn load_whisper(model_path: &Path) -> Result<SpeechBackend> {
|
|
let backend = WhisperRsBackend::load(model_path)
|
|
.map_err(|e| KonError::TranscriptionFailed(format!("Failed to load Whisper: {e}")))?;
|
|
Ok(SpeechBackend::WhisperRs(backend))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn engine_reports_not_available_before_loading() {
|
|
let engine = LocalEngine::new(EngineName::new("test"));
|
|
assert!(!engine.is_loaded());
|
|
assert!(engine.loaded_model_id().is_none());
|
|
}
|
|
}
|