From 42ccd3e21dd0fe48ea80b8514755f5469703ed85 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 20 Mar 2026 13:56:32 -0700 Subject: [PATCH] Fix cargo fmt formatting and diarize threading test mock --- python/tests/test_diarize.py | 5 +++-- src-tauri/src/commands/ai.rs | 6 +++++- src-tauri/src/commands/export.rs | 6 +++++- src-tauri/src/commands/system.rs | 4 +--- src-tauri/src/commands/transcribe.rs | 16 +++++++++++----- src-tauri/src/db/schema.rs | 6 +----- src-tauri/src/llama/mod.rs | 6 +----- src-tauri/src/sidecar/mod.rs | 14 ++++++++++---- src-tauri/src/state.rs | 6 ++---- 9 files changed, 39 insertions(+), 30 deletions(-) diff --git a/python/tests/test_diarize.py b/python/tests/test_diarize.py index 377e297..b3f75f0 100644 --- a/python/tests/test_diarize.py +++ b/python/tests/test_diarize.py @@ -49,8 +49,9 @@ def test_diarize_threading_progress(monkeypatch): # Mock pipeline that takes ~5 seconds def slow_pipeline(file_path, **kwargs): time.sleep(5) - # Return a mock diarization result - mock_result = MagicMock() + # Return a mock diarization result (use spec=object to prevent + # hasattr returning True for speaker_diarization) + mock_result = MagicMock(spec=[]) mock_track = MagicMock() mock_track.start = 0.0 mock_track.end = 5.0 diff --git a/src-tauri/src/commands/ai.rs b/src-tauri/src/commands/ai.rs index 99e699e..a102e81 100644 --- a/src-tauri/src/commands/ai.rs +++ b/src-tauri/src/commands/ai.rs @@ -39,7 +39,11 @@ pub fn ai_chat( if response.msg_type == "error" { return Err(format!( "AI error: {}", - response.payload.get("message").and_then(|v| v.as_str()).unwrap_or("unknown") + response + .payload + .get("message") + .and_then(|v| v.as_str()) + .unwrap_or("unknown") )); } diff --git a/src-tauri/src/commands/export.rs b/src-tauri/src/commands/export.rs index fb91026..9d2f4a1 100644 --- a/src-tauri/src/commands/export.rs +++ b/src-tauri/src/commands/export.rs @@ -33,7 +33,11 @@ pub fn export_transcript( if response.msg_type == "error" { return Err(format!( "Export error: {}", - response.payload.get("message").and_then(|v| v.as_str()).unwrap_or("unknown") + response + .payload + .get("message") + .and_then(|v| v.as_str()) + .unwrap_or("unknown") )); } diff --git a/src-tauri/src/commands/system.rs b/src-tauri/src/commands/system.rs index daed78d..985b465 100644 --- a/src-tauri/src/commands/system.rs +++ b/src-tauri/src/commands/system.rs @@ -22,9 +22,7 @@ pub fn llama_start( threads: Option, ) -> Result { let config = LlamaConfig { - binary_path: PathBuf::from( - binary_path.unwrap_or_else(|| "llama-server".to_string()), - ), + binary_path: PathBuf::from(binary_path.unwrap_or_else(|| "llama-server".to_string())), model_path: PathBuf::from(model_path), port: port.unwrap_or(0), n_gpu_layers: n_gpu_layers.unwrap_or(0), diff --git a/src-tauri/src/commands/transcribe.rs b/src-tauri/src/commands/transcribe.rs index 4c7695d..7135987 100644 --- a/src-tauri/src/commands/transcribe.rs +++ b/src-tauri/src/commands/transcribe.rs @@ -33,7 +33,11 @@ pub fn transcribe_file( if response.msg_type == "error" { return Err(format!( "Transcription error: {}", - response.payload.get("message").and_then(|v| v.as_str()).unwrap_or("unknown") + response + .payload + .get("message") + .and_then(|v| v.as_str()) + .unwrap_or("unknown") )); } @@ -42,9 +46,7 @@ pub fn transcribe_file( /// Download and validate the diarization model via the Python sidecar. #[tauri::command] -pub fn download_diarize_model( - hf_token: String, -) -> Result { +pub fn download_diarize_model(hf_token: String) -> Result { let manager = sidecar(); manager.ensure_running()?; @@ -116,7 +118,11 @@ pub fn run_pipeline( if response.msg_type == "error" { return Err(format!( "Pipeline error: {}", - response.payload.get("message").and_then(|v| v.as_str()).unwrap_or("unknown") + response + .payload + .get("message") + .and_then(|v| v.as_str()) + .unwrap_or("unknown") )); } diff --git a/src-tauri/src/db/schema.rs b/src-tauri/src/db/schema.rs index 000eded..70494f7 100644 --- a/src-tauri/src/db/schema.rs +++ b/src-tauri/src/db/schema.rs @@ -96,11 +96,7 @@ pub fn create_tables(conn: &Connection) -> Result<(), DatabaseError> { )?; // Initialize schema version if empty - let count: i32 = conn.query_row( - "SELECT COUNT(*) FROM schema_version", - [], - |row| row.get(0), - )?; + let count: i32 = conn.query_row("SELECT COUNT(*) FROM schema_version", [], |row| row.get(0))?; if count == 0 { conn.execute( "INSERT INTO schema_version (version) VALUES (?1)", diff --git a/src-tauri/src/llama/mod.rs b/src-tauri/src/llama/mod.rs index 4cebccf..2cb5b81 100644 --- a/src-tauri/src/llama/mod.rs +++ b/src-tauri/src/llama/mod.rs @@ -237,11 +237,7 @@ impl LlamaManager { /// Get the current status. pub fn status(&self) -> LlamaStatus { - let running = self - .process - .lock() - .ok() - .map_or(false, |p| p.is_some()); + let running = self.process.lock().ok().map_or(false, |p| p.is_some()); let port = self.port.lock().ok().map_or(0, |p| *p); let model = self .model_path diff --git a/src-tauri/src/sidecar/mod.rs b/src-tauri/src/sidecar/mod.rs index 7879038..8444f56 100644 --- a/src-tauri/src/sidecar/mod.rs +++ b/src-tauri/src/sidecar/mod.rs @@ -108,7 +108,10 @@ impl SidecarManager { } } // Non-JSON or non-ready line — skip and keep waiting - eprintln!("[sidecar-rs] Skipping pre-ready line: {}", &trimmed[..trimmed.len().min(200)]); + eprintln!( + "[sidecar-rs] Skipping pre-ready line: {}", + &trimmed[..trimmed.len().min(200)] + ); continue; } } @@ -165,7 +168,10 @@ impl SidecarManager { let response: IPCMessage = match serde_json::from_str(trimmed) { Ok(msg) => msg, Err(_) => { - eprintln!("[sidecar-rs] Skipping non-JSON line: {}", &trimmed[..trimmed.len().min(200)]); + eprintln!( + "[sidecar-rs] Skipping non-JSON line: {}", + &trimmed[..trimmed.len().min(200)] + ); continue; } }; @@ -226,8 +232,8 @@ impl SidecarManager { if trimmed.is_empty() { continue; } - let response: IPCMessage = serde_json::from_str(trimmed) - .map_err(|e| format!("Parse error: {e}"))?; + let response: IPCMessage = + serde_json::from_str(trimmed).map_err(|e| format!("Parse error: {e}"))?; // Forward intermediate messages via callback, return the final result/error let is_intermediate = matches!( diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs index 2ad86db..320a22a 100644 --- a/src-tauri/src/state.rs +++ b/src-tauri/src/state.rs @@ -15,12 +15,10 @@ pub struct AppState { impl AppState { pub fn new() -> Result { let data_dir = LlamaManager::data_dir(); - std::fs::create_dir_all(&data_dir) - .map_err(|e| format!("Cannot create data dir: {e}"))?; + std::fs::create_dir_all(&data_dir).map_err(|e| format!("Cannot create data dir: {e}"))?; let db_path = data_dir.join("voice_to_notes.db"); - let conn = db::open_database(&db_path) - .map_err(|e| format!("Cannot open database: {e}"))?; + let conn = db::open_database(&db_path).map_err(|e| format!("Cannot open database: {e}"))?; Ok(Self { db: Mutex::new(conn),