Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion frontend/src-tauri/src/audio/transcription/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use super::provider::TranscriptionProvider;
use log::{info, warn};
use std::sync::Arc;
use tauri::{AppHandle, Manager, Runtime};
use tauri::{AppHandle, Emitter, Manager, Runtime};

// ============================================================================
// TRANSCRIPTION ENGINE ENUM
Expand Down Expand Up @@ -233,6 +233,12 @@ pub async fn get_or_init_whisper<R: Runtime>(
engine_guard.as_ref().cloned()
};

// Emit model loading status event
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "checking",
"message": "Checking transcription model..."
}));

if let Some(engine) = existing_engine {
// Check if a model is already loaded
if engine.is_model_loaded().await {
Expand Down Expand Up @@ -277,12 +283,20 @@ pub async fn get_or_init_whisper<R: Runtime>(
"✅ Loaded model '{}' matches saved config, reusing",
current_model
);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", current_model)
}));
return Ok(engine);
} else {
info!(
"🔄 Loaded model '{}' doesn't match saved config '{}', reloading correct model...",
current_model, expected_model
);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "switching",
"message": format!("Switching model from '{}' to '{}'...", current_model, expected_model)
}));
// Unload the incorrect model
engine.unload_model().await;
info!("📉 Unloaded incorrect model '{}'", current_model);
Expand All @@ -294,6 +308,10 @@ pub async fn get_or_init_whisper<R: Runtime>(
"✅ No specific model configured, using currently loaded model: '{}'",
current_model
);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", current_model)
}));
return Ok(engine);
}
} else {
Expand Down Expand Up @@ -388,11 +406,19 @@ pub async fn get_or_init_whisper<R: Runtime>(
match model.status {
crate::whisper_engine::ModelStatus::Available => {
info!("Loading model: {}", model_to_load);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "loading",
"message": format!("Loading model '{}'...", model_to_load)
}));
engine
.load_model(&model_to_load)
.await
.map_err(|e| format!("Failed to load model '{}': {}", model_to_load, e))?;
info!("✅ Model '{}' loaded successfully", model_to_load);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", model_to_load)
}));
}
crate::whisper_engine::ModelStatus::Missing => {
return Err(format!(
Expand Down Expand Up @@ -423,6 +449,10 @@ pub async fn get_or_init_whisper<R: Runtime>(
"Model '{}' not found, falling back to available model: '{}'",
model_to_load, fallback_model.name
);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "loading",
"message": format!("Loading fallback model '{}'...", fallback_model.name)
}));
engine.load_model(&fallback_model.name).await.map_err(|e| {
format!(
"Failed to load fallback model '{}': {}",
Expand All @@ -433,6 +463,10 @@ pub async fn get_or_init_whisper<R: Runtime>(
"✅ Fallback model '{}' loaded successfully",
fallback_model.name
);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", fallback_model.name)
}));
} else {
return Err(format!("Model '{}' is not supported and no other models are available. Please download a model from the settings.", model_to_load));
}
Expand Down
19 changes: 19 additions & 0 deletions frontend/src-tauri/src/parakeet_engine/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,19 @@ pub async fn parakeet_validate_model_ready_with_config<R: tauri::Runtime>(
};

if let Some(engine) = engine {
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "checking",
"message": "Checking transcription model..."
}));

// Check if a model is currently loaded
if engine.is_model_loaded().await {
if let Some(current_model) = engine.get_current_model().await {
log::info!("Parakeet model already loaded: {}", current_model);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", current_model)
}));
return Ok(current_model);
}
}
Expand Down Expand Up @@ -332,11 +341,21 @@ pub async fn parakeet_validate_model_ready_with_config<R: tauri::Runtime>(
.clone()
};

let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "loading",
"message": format!("Loading model '{}'...", model_name)
}));

engine
.load_model(&model_name)
.await
.map_err(|e| format!("Failed to load Parakeet model {}: {}", model_name, e))?;

let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", model_name)
}));

Ok(model_name)
} else {
Err("Parakeet engine not initialized".to_string())
Expand Down
19 changes: 19 additions & 0 deletions frontend/src-tauri/src/whisper_engine/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,19 @@ pub async fn whisper_validate_model_ready_with_config<R: tauri::Runtime>(
};

if let Some(engine) = engine {
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "checking",
"message": "Checking transcription model..."
}));

// Check if a model is currently loaded
if engine.is_model_loaded().await {
if let Some(current_model) = engine.get_current_model().await {
log::info!("Model already loaded: {}", current_model);
let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", current_model)
}));
return Ok(current_model);
}
}
Expand Down Expand Up @@ -373,11 +382,21 @@ pub async fn whisper_validate_model_ready_with_config<R: tauri::Runtime>(
available_models[0].name.clone()
};

let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "loading",
"message": format!("Loading model '{}'...", model_name)
}));

engine
.load_model(&model_name)
.await
.map_err(|e| format!("Failed to load model {}: {}", model_name, e))?;

let _ = app.emit("model-loading-status", serde_json::json!({
"stage": "ready",
"message": format!("Model '{}' ready", model_name)
}));

Ok(model_name)
} else {
Err("Whisper engine not initialized".to_string())
Expand Down
39 changes: 37 additions & 2 deletions frontend/src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import { useState, useEffect } from 'react';
import { motion } from 'framer-motion';
import { motion, AnimatePresence } from 'framer-motion';
import { RecordingControls } from '@/components/RecordingControls';
import { useSidebar } from '@/components/Sidebar/SidebarProvider';
import { usePermissionCheck } from '@/hooks/usePermissionCheck';
Expand All @@ -21,6 +21,7 @@ import { TranscriptRecovery } from '@/components/TranscriptRecovery';
import { indexedDBService } from '@/services/indexedDBService';
import { toast } from 'sonner';
import { useRouter } from 'next/navigation';
import { Loader2 } from 'lucide-react';

export default function Home() {
// Local page state (not moved to contexts)
Expand Down Expand Up @@ -62,6 +63,27 @@ export default function Home() {

const router = useRouter();

// Model loading status
const [modelStatus, setModelStatus] = useState<{ stage: string; message: string } | null>(null);

useEffect(() => {
let unlisten: (() => void) | undefined;
let mounted = true;
import('@tauri-apps/api/event').then(({ listen }) => {
listen<{ stage: string; message: string }>('model-loading-status', (event) => {
if (!mounted) return;
const { stage, message } = event.payload;
if (stage === 'ready') {
setModelStatus({ stage, message });
setTimeout(() => { if (mounted) setModelStatus(null); }, 1500);
} else {
setModelStatus({ stage, message });
}
}).then(fn => { unlisten = fn; });
});
return () => { mounted = false; unlisten?.(); };
}, []);

useEffect(() => {
// Track page view
Analytics.trackPageView('home');
Expand Down Expand Up @@ -225,11 +247,24 @@ export default function Home() {
status !== RecordingStatus.SAVING && (
<div className="fixed bottom-12 left-0 right-0 z-10">
<div
className="flex justify-center pl-8 transition-[margin] duration-300"
className="flex flex-col items-center pl-8 transition-[margin] duration-300"
style={{
marginLeft: sidebarCollapsed ? '4rem' : '16rem'
}}
>
<AnimatePresence>
{modelStatus && modelStatus.stage !== 'ready' && (
<motion.div
initial={{ opacity: 0, y: 10 }}
animate={{ opacity: 1, y: 0 }}
exit={{ opacity: 0, y: 10 }}
className="mb-2 flex items-center gap-2 bg-white/90 backdrop-blur-sm rounded-full px-4 py-1.5 shadow-md text-sm text-gray-600"
>
<Loader2 className="h-3.5 w-3.5 animate-spin text-blue-500" />
<span>{modelStatus.message}</span>
</motion.div>
)}
</AnimatePresence>
<div className="w-2/3 max-w-[750px] flex justify-center">
<div className="bg-white rounded-full shadow-lg flex items-center">
<RecordingControls
Expand Down