Skip to content

Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.

fix: updated download progress indicator for models

Gabriel Stein0b53b91e66a0
diff --git a/src/components/WhisperModelPicker.tsx b/src/components/WhisperModelPicker.tsx
index ade0bfcb4..0a9c54519 100644
--- a/src/components/WhisperModelPicker.tsx
+++ b/src/components/WhisperModelPicker.tsx
@@ -1,13 +1,28 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useCallback, useMemo } from "react";
import { Button } from "./ui/button";
import { RefreshCw, Download, Trash2 } from "lucide-react";
+// Type assertion for window.electronAPI
+declare global {
+ interface Window {
+ electronAPI: any;
+ }
+}
+
interface WhisperModel {
model: string;
downloaded: boolean;
size_mb?: number;
}
+interface DownloadProgress {
+ percentage: number;
+ downloadedBytes: number;
+ totalBytes: number;
+ speed?: number;
+ eta?: number;
+}
+
interface WhisperModelPickerProps {
selectedModel: string;
onModelSelect: (model: string) => void;
@@ -15,6 +30,71 @@ interface WhisperModelPickerProps {
variant?: "onboarding" | "settings";
}
+const MODEL_DESCRIPTIONS = {
+ tiny: "Fastest, lower quality",
+ base: "Good balance (recommended)",
+ small: "Better quality, slower",
+ medium: "High quality",
+ large: "Best quality, slowest",
+} as const;
+
+const VARIANT_STYLES = {
+ onboarding: {
+ container: "bg-gray-50 p-4 rounded-lg",
+ progress: "bg-blue-50 border-b border-blue-200",
+ progressText: "text-blue-900",
+ progressBar: "bg-blue-200",
+ progressFill: "bg-gradient-to-r from-blue-500 to-blue-600",
+ header: "font-medium text-gray-900 mb-3",
+ modelCard: {
+ selected: "border-blue-500 bg-blue-50",
+ default: "border-gray-200 bg-white hover:border-gray-300",
+ },
+ badges: {
+ selected:
+ "text-xs text-blue-600 bg-blue-100 px-2 py-1 rounded-full font-medium",
+ downloaded: "text-xs text-green-600 bg-green-100 px-2 py-1 rounded",
+ },
+ buttons: {
+ download: "bg-blue-600 hover:bg-blue-700",
+ select: "border-gray-300 text-gray-700 hover:bg-gray-50",
+ delete: "text-red-600 hover:text-red-700 hover:bg-red-50 border-red-200",
+ refresh: "border-gray-300 text-gray-700 hover:bg-gray-50",
+ },
+ },
+ settings: {
+ container: "bg-white border border-purple-200 rounded-lg overflow-hidden",
+ progress: "bg-purple-50 border-b border-purple-200",
+ progressText: "text-purple-900",
+ progressBar: "bg-purple-200",
+ progressFill: "bg-gradient-to-r from-purple-500 to-purple-600",
+ header: "font-medium text-purple-900",
+ modelCard: {
+ selected: "border-purple-500 bg-purple-50",
+ default: "border-purple-200 bg-white hover:border-purple-300",
+ },
+ badges: {
+ selected:
+ "text-xs text-purple-600 bg-purple-100 px-2 py-1 rounded-full font-medium",
+ downloaded:
+ "text-xs text-emerald-600 bg-emerald-100 px-2 py-1 rounded-md",
+ },
+ buttons: {
+ download: "bg-purple-600 hover:bg-purple-700",
+ select: "border-purple-300 text-purple-700 hover:bg-purple-50",
+ delete: "text-red-600 hover:text-red-700 hover:bg-red-50 border-red-200",
+ refresh: "border-purple-300 text-purple-700 hover:bg-purple-50",
+ },
+ },
+} as const;
+
+function formatETA(seconds: number): string {
+ if (seconds < 60) return `${Math.round(seconds)}s`;
+ const minutes = Math.floor(seconds / 60);
+ const remainingSeconds = Math.round(seconds % 60);
+ return `${minutes}m ${remainingSeconds}s`;
+}
+
export default function WhisperModelPicker({
selectedModel,
onModelSelect,
@@ -23,43 +103,63 @@ export default function WhisperModelPicker({
}: WhisperModelPickerProps) {
const [modelList, setModelList] = useState<WhisperModel[]>([]);
const [downloadingModel, setDownloadingModel] = useState<string | null>(null);
- const [downloadProgress, setDownloadProgress] = useState(0);
+ const [downloadProgress, setDownloadProgress] = useState<DownloadProgress>({
+ percentage: 0,
+ downloadedBytes: 0,
+ totalBytes: 0,
+ });
const [loadingModels, setLoadingModels] = useState(false);
- const modelDescriptions = {
- tiny: "Fastest, lower quality",
- base: "Good balance (recommended)",
- small: "Better quality, slower",
- medium: "High quality",
- large: "Best quality, slowest",
- };
-
- useEffect(() => {
- loadModelList();
+ const styles = useMemo(() => VARIANT_STYLES[variant], [variant]);
- // Set up progress listener for model downloads
- const handleDownloadProgress = (
- event: any,
- data: {
- type: string;
- model: string;
- percentage?: number;
- downloaded_bytes?: number;
- total_bytes?: number;
- error?: string;
- result?: any;
+ const loadModelList = useCallback(async () => {
+ try {
+ setLoadingModels(true);
+ const result = await window.electronAPI.listWhisperModels();
+ if (result.success) {
+ setModelList(result.models);
}
- ) => {
+ } catch (error) {
+ console.error("Failed to load model list:", error);
+ } finally {
+ setLoadingModels(false);
+ }
+ }, []);
+
+ const handleDownloadProgress = useCallback(
+ (event: any, data: any) => {
if (data.type === "progress") {
- setDownloadProgress(data.percentage || 0);
+ const progress: DownloadProgress = {
+ percentage: data.percentage || 0,
+ downloadedBytes: data.downloaded_bytes || 0,
+ totalBytes: data.total_bytes || 0,
+ };
+
+ // Calculate ETA based on speed
+ if (data.speed_mbps && data.speed_mbps > 0) {
+ const remainingBytes = progress.totalBytes - progress.downloadedBytes;
+ // ETA in seconds: (remainingBytes * 8) / (speed_mbps * 1_000_000)
+ progress.eta = (remainingBytes * 8) / (data.speed_mbps * 1_000_000);
+ progress.speed = data.speed_mbps;
+ }
+
+ setDownloadProgress(progress);
} else if (data.type === "complete") {
setDownloadingModel(null);
- setDownloadProgress(0);
+ setDownloadProgress({
+ percentage: 0,
+ downloadedBytes: 0,
+ totalBytes: 0,
+ });
loadModelList();
} else if (data.type === "error") {
setDownloadingModel(null);
- setDownloadProgress(0);
- // Show user-friendly error message
+ setDownloadProgress({
+ percentage: 0,
+ downloadedBytes: 0,
+ totalBytes: 0,
+ });
+
if (data.error?.includes("interrupted by user")) {
console.log("Model download was cancelled by user");
} else if (data.error?.includes("timeout")) {
@@ -70,168 +170,105 @@ export default function WhisperModelPicker({
alert(`❌ Model download failed: ${data.error || "Unknown error"}`);
}
}
- };
+ },
+ [loadModelList]
+ );
+ useEffect(() => {
+ loadModelList();
window.electronAPI.onWhisperDownloadProgress(handleDownloadProgress);
+ }, [loadModelList, handleDownloadProgress]);
- return () => {
- // Cleanup would go here if needed
- };
- }, []);
-
- const loadModelList = async () => {
- try {
- setLoadingModels(true);
- const result = await window.electronAPI.listWhisperModels();
- if (result.success) {
- setModelList(result.models);
- }
- } catch (error) {
- console.error("Failed to load model list:", error);
- } finally {
- setLoadingModels(false);
- }
- };
-
- const downloadModel = async (modelName: string) => {
- try {
- setDownloadingModel(modelName);
- setDownloadProgress(0);
-
- const result = await window.electronAPI.downloadWhisperModel(modelName);
-
- if (result.success) {
- await loadModelList();
- } else {
- alert(`❌ Failed to download model "${modelName}": ${result.error}`);
- }
- } catch (error) {
- alert(`❌ Failed to download model "${modelName}": ${error}`);
- } finally {
- setDownloadingModel(null);
- setDownloadProgress(0);
- }
- };
-
- const deleteModel = async (modelName: string) => {
- if (
- confirm(
- `Are you sure you want to delete the "${modelName}" model? This will free up disk space but you'll need to re-download it if you want to use it again.`
- )
- ) {
+ const downloadModel = useCallback(
+ async (modelName: string) => {
try {
- const result = await window.electronAPI.deleteWhisperModel(modelName);
+ setDownloadingModel(modelName);
+ setDownloadProgress({
+ percentage: 0,
+ downloadedBytes: 0,
+ totalBytes: 0,
+ });
+
+ const result = await window.electronAPI.downloadWhisperModel(modelName);
if (result.success) {
- alert(
- `✅ Model "${modelName}" deleted successfully! Freed ${result.freed_mb}MB of disk space.`
- );
- loadModelList();
+ await loadModelList();
} else {
- alert(`❌ Failed to delete model "${modelName}": ${result.error}`);
+ alert(`❌ Failed to download model "${modelName}": ${result.error}`);
}
} catch (error) {
- alert(`❌ Failed to delete model "${modelName}": ${error}`);
+ alert(`❌ Failed to download model "${modelName}": ${error}`);
+ } finally {
+ setDownloadingModel(null);
+ setDownloadProgress({
+ percentage: 0,
+ downloadedBytes: 0,
+ totalBytes: 0,
+ });
}
- }
- };
+ },
+ [loadModelList]
+ );
- const getStyles = () => {
- if (variant === "onboarding") {
- return {
- container: "bg-gray-50 p-4 rounded-lg",
- header: "font-medium text-gray-900 mb-3",
- modelCard: (isSelected: boolean) =>
- `flex items-center justify-between p-3 rounded-lg border-2 transition-all ${
- isSelected
- ? "border-blue-500 bg-blue-50"
- : "border-gray-200 bg-white hover:border-gray-300"
- }`,
- modelName: "capitalize font-medium text-gray-900",
- selectedBadge:
- "text-xs text-blue-600 bg-blue-100 px-2 py-1 rounded-full font-medium",
- downloadedBadge:
- "text-xs text-green-600 bg-green-100 px-2 py-1 rounded",
- selectButton: "border-gray-300 text-gray-700 hover:bg-gray-50",
- deleteButton:
- "text-red-600 hover:text-red-700 hover:bg-red-50 border-red-200 hover:border-red-600",
- downloadButton: "bg-blue-600 hover:bg-blue-700",
- refreshButton:
- "border-gray-300 text-gray-700 hover:bg-gray-50 hover:border-gray-600",
- };
- } else {
- return {
- container:
- "bg-white border border-purple-200 rounded-lg overflow-hidden",
- header: "font-medium text-purple-900",
- modelCard: (isSelected: boolean) =>
- `flex items-center justify-between p-3 rounded-lg border-2 transition-all ${
- isSelected
- ? "border-purple-500 bg-purple-50"
- : "border-purple-200 bg-white hover:border-purple-300"
- }`,
- modelName: "font-medium text-purple-900 capitalize",
- selectedBadge:
- "text-xs text-purple-600 bg-purple-100 px-2 py-1 rounded-full font-medium",
- downloadedBadge:
- "text-xs text-emerald-600 bg-emerald-100 px-2 py-1 rounded-md",
- selectButton: "border-purple-300 text-purple-700 hover:bg-purple-50",
- deleteButton:
- "text-red-600 hover:text-red-700 hover:bg-red-50 border-red-200 hover:border-red-600",
- downloadButton: "bg-purple-600 hover:bg-purple-700",
- refreshButton:
- "border-purple-300 text-purple-700 hover:bg-purple-50 hover:border-purple-600",
- };
- }
- };
+ const deleteModel = useCallback(
+ async (modelName: string) => {
+ if (
+ confirm(
+ `Are you sure you want to delete the "${modelName}" model? This will free up disk space but you'll need to re-download it if you want to use it again.`
+ )
+ ) {
+ try {
+ const result = await window.electronAPI.deleteWhisperModel(modelName);
- const styles = getStyles();
+ if (result.success) {
+ alert(
+ `✅ Model "${modelName}" deleted successfully! Freed ${result.freed_mb}MB of disk space.`
+ );
+ loadModelList();
+ } else {
+ alert(`❌ Failed to delete model "${modelName}": ${result.error}`);
+ }
+ } catch (error) {
+ alert(`❌ Failed to delete model "${modelName}": ${error}`);
+ }
+ }
+ },
+ [loadModelList]
+ );
- return (
- <div className={`${styles.container} ${className}`}>
- {/* Download Progress Bar */}
- {downloadingModel && (
- <div
- className={`${
- variant === "onboarding"
- ? "bg-blue-50 border-b border-blue-200"
- : "bg-purple-50 border-b border-purple-200"
- } p-3`}
- >
- <div className="flex items-center justify-between mb-2">
- <span
- className={`text-sm font-medium ${
- variant === "onboarding" ? "text-blue-900" : "text-purple-900"
- }`}
- >
- Downloading {downloadingModel} model...
- </span>
- <span
- className={`text-xs ${
- variant === "onboarding" ? "text-blue-700" : "text-purple-700"
- }`}
- >
- {Math.round(downloadProgress)}%
- </span>
- </div>
+ const progressDisplay = useMemo(() => {
+ if (!downloadingModel) return null;
+
+ const { percentage, speed, eta } = downloadProgress;
+ const progressText = `${Math.round(percentage)}%`;
+ const speedText = speed ? ` • ${speed.toFixed(1)} MB/s` : "";
+ const etaText = eta ? ` • ETA: ${formatETA(eta)}` : "";
+
+ return (
+ <div className={`${styles.progress} p-3`}>
+ <div className="flex items-center justify-between mb-2">
+ <span className={`text-sm font-medium ${styles.progressText}`}>
+ Downloading {downloadingModel} model...
+ </span>
+ <span className={`text-xs ${styles.progressText}`}>
+ {progressText}
+ {speedText}
+ {etaText}
+ </span>
+ </div>
+ <div className={`w-full ${styles.progressBar} rounded-full h-2`}>
<div
- className={`w-full ${
- variant === "onboarding" ? "bg-blue-200" : "bg-purple-200"
- } rounded-full h-2`}
- >
- <div
- className={`${
- variant === "onboarding"
- ? "bg-gradient-to-r from-blue-500 to-blue-600"
- : "bg-gradient-to-r from-purple-500 to-purple-600"
- } h-2 rounded-full transition-all duration-300 ease-out`}
- style={{
- width: `${Math.min(downloadProgress, 100)}%`,
- }}
- ></div>
- </div>
+ className={`${styles.progressFill} h-2 rounded-full transition-all duration-300 ease-out`}
+ style={{ width: `${Math.min(percentage, 100)}%` }}
+ />
</div>
- )}
+ </div>
+ );
+ }, [downloadingModel, downloadProgress, styles]);
+
+ return (
+ <div className={`${styles.container} ${className}`}>
+ {progressDisplay}
<div className="p-4">
<div className="flex items-center justify-between mb-3">
@@ -241,7 +278,7 @@ export default function WhisperModelPicker({
variant="outline"
size="sm"
disabled={loadingModels}
- className={styles.refreshButton}
+ className={styles.buttons.refresh}
>
<RefreshCw
size={14}
@@ -256,32 +293,36 @@ export default function WhisperModelPicker({
<div className="space-y-2">
{modelList.map((model) => {
const isSelected = model.model === selectedModel;
+ const isDownloading = downloadingModel === model.model;
return (
- <div key={model.model} className={styles.modelCard(isSelected)}>
+ <div
+ key={model.model}
+ className={`flex items-center justify-between p-3 rounded-lg border-2 transition-all ${
+ isSelected
+ ? styles.modelCard.selected
+ : styles.modelCard.default
+ }`}
+ >
<div className="flex-1">
<div className="flex items-center gap-2">
- <span className={styles.modelName}>{model.model}</span>
+ <span className="capitalize font-medium">
+ {model.model}
+ </span>
{isSelected && (
- <span className={styles.selectedBadge}>✓ Selected</span>
+ <span className={styles.badges.selected}>✓ Selected</span>
)}
</div>
<div className="flex items-center gap-2 mt-1">
- <p
- className={`text-xs ${
- variant === "onboarding"
- ? "text-gray-600"
- : "text-purple-700"
- }`}
- >
+ <p className="text-xs text-gray-600">
{
- modelDescriptions[
- model.model as keyof typeof modelDescriptions
+ MODEL_DESCRIPTIONS[
+ model.model as keyof typeof MODEL_DESCRIPTIONS
]
}
</p>
{model.downloaded && (
- <span className={styles.downloadedBadge}>
+ <span className={styles.badges.downloaded}>
✓ Downloaded{" "}
{model.size_mb ? `(${model.size_mb}MB)` : ""}
</span>
@@ -302,7 +343,7 @@ export default function WhisperModelPicker({
onClick={() => onModelSelect(model.model)}
size="sm"
variant="outline"
- className={styles.selectButton}
+ className={styles.buttons.select}
>
Select
</Button>
@@ -311,7 +352,7 @@ export default function WhisperModelPicker({
onClick={() => deleteModel(model.model)}
size="sm"
variant="outline"
- className={styles.deleteButton}
+ className={styles.buttons.delete}
>
<Trash2 size={14} />
<span className="ml-1">Delete</span>
@@ -321,12 +362,12 @@ export default function WhisperModelPicker({
{!model.downloaded && (
<Button
onClick={() => downloadModel(model.model)}
- disabled={downloadingModel === model.model}
+ disabled={isDownloading}
size="sm"
- className={styles.downloadButton}
+ className={styles.buttons.download}
>
- {downloadingModel === model.model ? (
- `${Math.round(downloadProgress)}%`
+ {isDownloading ? (
+ `${Math.round(downloadProgress.percentage)}%`
) : (
<>
<Download size={14} />
diff --git a/src/helpers/ipcHandlers.js b/src/helpers/ipcHandlers.js
index 5595080df..3b5dd7c03 100644
--- a/src/helpers/ipcHandlers.js
+++ b/src/helpers/ipcHandlers.js
@@ -150,32 +150,14 @@ class IPCHandlers {
ipcMain.handle("download-whisper-model", async (event, modelName) => {
try {
- // Set up progress forwarding for model downloads
- const originalConsoleError = console.error;
- console.error = (...args) => {
- const message = args.join(" ");
- if (message.startsWith("PROGRESS:")) {
- try {
- const progressData = JSON.parse(message.substring(9));
- event.sender.send("whisper-download-progress", {
- type: "progress",
- model: modelName,
- ...progressData,
- });
- } catch (parseError) {
- // Ignore parsing errors for progress data
- }
- }
- originalConsoleError(...args);
- };
-
const result = await this.whisperManager.downloadWhisperModel(
- modelName
+ modelName,
+ (progressData) => {
+ // Forward progress updates to the renderer
+ event.sender.send("whisper-download-progress", progressData);
+ }
);
- // Restore original console.error
- console.error = originalConsoleError;
-
// Send completion event
event.sender.send("whisper-download-progress", {
type: "complete",
diff --git a/src/helpers/whisper.js b/src/helpers/whisper.js
index 8d4dd23e3..45c54bbb6 100644
--- a/src/helpers/whisper.js
+++ b/src/helpers/whisper.js
@@ -330,7 +330,7 @@ class WhisperManager {
}
}
- async downloadWhisperModel(modelName) {
+ async downloadWhisperModel(modelName, progressCallback = null) {
try {
console.log(`📥 Starting download of Whisper model: ${modelName}`);
@@ -350,12 +350,6 @@ class WhisperManager {
modelName,
];
- console.log(
- "🔧 Running model download command:",
- pythonCmd,
- args.join(" ")
- );
-
return new Promise((resolve, reject) => {
const downloadProcess = spawn(pythonCmd, args);
@@ -369,14 +363,33 @@ class WhisperManager {
downloadProcess.stderr.on("data", (data) => {
const output = data.toString();
stderr += output;
- console.log("Model download log:", output);
+
+ // Parse progress updates from stderr
+ const lines = output.split("\n");
+ for (const line of lines) {
+ const trimmed = line.trim();
+ if (trimmed.startsWith("PROGRESS:")) {
+ try {
+ const progressData = JSON.parse(trimmed.substring(9));
+ if (progressCallback) {
+ progressCallback({
+ type: "progress",
+ model: modelName,
+ ...progressData,
+ });
+ }
+ } catch (parseError) {
+ // Ignore parsing errors for progress data
+ }
+ }
+ }
});
downloadProcess.on("close", (code) => {
if (code === 0) {
try {
const result = JSON.parse(stdout);
- console.log(`✅ Model ${modelName} download completed:`, result);
+ console.log(`✅ Model ${modelName} download completed`);
resolve(result);
} catch (parseError) {
console.error("❌ Failed to parse download result:", parseError);
@@ -388,7 +401,6 @@ class WhisperManager {
}
} else {
console.error("❌ Model download failed with code:", code);
- console.error("Stderr:", stderr);
reject(
new Error(`Model download failed (code ${code}): ${stderr}`)
);
diff --git a/whisper_bridge.py b/whisper_bridge.py
index 1bfe0b023..82418c27a 100755
--- a/whisper_bridge.py
+++ b/whisper_bridge.py
@@ -28,9 +28,7 @@ def load_model(model_name="base"):
return _model_cache[model_name]
try:
- print(f"Loading Whisper model: {model_name}", file=sys.stderr)
model = whisper.load_model(model_name)
- print(f"Model {model_name} loaded successfully", file=sys.stderr)
# Cache the model but limit cache size
if len(_model_cache) >= 2: # Keep max 2 models in memory
@@ -42,7 +40,6 @@ def load_model(model_name="base"):
_model_cache[model_name] = model
return model
except Exception as e:
- print(f"Error loading model: {e}", file=sys.stderr)
return None
def get_expected_model_size(model_name):
@@ -54,8 +51,8 @@ def get_expected_model_size(model_name):
content_length = response.headers.get('content-length')
if content_length:
return int(content_length)
- except Exception as e:
- print(f"Could not get expected size for {model_name}: {e}", file=sys.stderr)
+ except Exception:
+ pass
# Fallback to approximate sizes (in bytes)
approximate_sizes = {
@@ -68,7 +65,7 @@ def get_expected_model_size(model_name):
}
return approximate_sizes.get(model_name, 100 * 1024 * 1024) # Default 100MB
-def monitor_download_progress(model_name, expected_size):
+def monitor_download_progress(model_name, expected_size, stop_event):
"""Monitor download progress by watching file size growth"""
cache_dir = os.path.expanduser("~/.cache/whisper")
model_url = whisper._MODELS[model_name]
@@ -79,19 +76,36 @@ def monitor_download_progress(model_name, expected_size):
last_size = 0
last_update_time = time.time()
- stagnant_count = 0
+ speed_samples = []
+ last_progress_update = 0
- while True:
+ while not stop_event.is_set():
try:
current_size = 0
if os.path.exists(model_file):
current_size = os.path.getsize(model_file)
current_time = time.time()
+ time_diff = current_time - last_update_time
+
+ # Calculate speed if we have a previous measurement
+ speed_mbps = 0
+ if last_size > 0 and time_diff > 0 and current_size > last_size:
+ bytes_per_second = (current_size - last_size) / time_diff
+ speed_mbps = (bytes_per_second * 8) / (1024 * 1024) # Convert to Mbps
+
+ # Keep rolling average of speed samples
+ speed_samples.append(speed_mbps)
+ if len(speed_samples) > 10: # Keep last 10 samples
+ speed_samples.pop(0)
+ speed_mbps = sum(speed_samples) / len(speed_samples)
+
+ # Send progress update (throttled to avoid spam)
+ percentage = min((current_size / expected_size * 100) if expected_size > 0 else 0, 100)
- # Only send updates if size changed or every 2 seconds
- if current_size != last_size or (current_time - last_update_time) >= 2:
- percentage = min((current_size / expected_size * 100) if expected_size > 0 else 0, 100)
+ # Only send progress updates every 0.5 seconds or when percentage changes significantly
+ if (current_time - last_progress_update > 0.5 or
+ abs(percentage - last_progress_update) > 1.0):
progress_data = {
"type": "progress",
@@ -99,46 +113,35 @@ def monitor_download_progress(model_name, expected_size):
"downloaded_bytes": current_size,
"total_bytes": expected_size,
"percentage": round(percentage, 1),
- "speed_mbps": 0
+ "speed_mbps": round(speed_mbps, 2) if speed_mbps > 0 else 0
}
- # Calculate download speed if we have a previous measurement
- if last_size > 0 and current_time > last_update_time:
- bytes_per_second = (current_size - last_size) / (current_time - last_update_time)
- mbps = (bytes_per_second * 8) / (1024 * 1024) # Convert to Mbps
- progress_data["speed_mbps"] = round(mbps, 2)
-
print(f"PROGRESS:{json.dumps(progress_data)}", file=sys.stderr)
+ last_progress_update = percentage
+
+ # Check if download is complete
+ if current_size >= expected_size * 0.95: # 95% threshold
+ break
- last_size = current_size
- last_update_time = current_time
-
- # Check if download is complete
- if current_size >= expected_size * 0.95: # 95% threshold to account for slight size differences
- print(f"Download appears complete: {current_size}/{expected_size} bytes", file=sys.stderr)
+ # Check if no progress for too long (stagnation detection)
+ if current_size == last_size and time_diff > 5: # 5 seconds no progress
+ if current_size > expected_size * 0.9: # If we're close to done, assume complete
break
+
+ last_size = current_size
+ last_update_time = current_time
- # Check for stagnation (no progress for too long)
- if current_size == last_size:
- stagnant_count += 1
- if stagnant_count > 100: # 10 seconds of no progress
- print(f"Download may be stagnant, checking if complete...", file=sys.stderr)
- if current_size > 0:
- break # Assume download is done
- else:
- stagnant_count = 0
-
- except Exception as e:
- print(f"Error monitoring progress: {e}", file=sys.stderr)
+ except Exception:
+ pass
- time.sleep(0.1) # Check every 100ms
+ time.sleep(0.5) # Check every 500ms
def download_model(model_name="base"):
"""Download Whisper model with real-time progress monitoring"""
+ stop_event = threading.Event()
progress_thread = None
+
try:
- print(f"Starting download of Whisper model: {model_name}", file=sys.stderr)
-
# Check if model is already downloaded
cache_dir = os.path.expanduser("~/.cache/whisper")
model_url = whisper._MODELS[model_name]
@@ -146,7 +149,6 @@ def download_model(model_name="base"):
if os.path.exists(model_file):
file_size = os.path.getsize(model_file)
- print(f"Model {model_name} already exists ({file_size} bytes)", file=sys.stderr)
return {
"model": model_name,
"downloaded": True,
@@ -158,40 +160,39 @@ def download_model(model_name="base"):
# Get expected file size
expected_size = get_expected_model_size(model_name)
- print(f"Expected size for {model_name}: {expected_size} bytes ({expected_size/(1024*1024):.1f} MB)", file=sys.stderr)
# Start progress monitoring in background thread
progress_thread = threading.Thread(
target=monitor_download_progress,
- args=(model_name, expected_size),
+ args=(model_name, expected_size, stop_event),
daemon=True
)
progress_thread.start()
# Start the actual download (this will block until complete)
- print(f"Initiating Whisper model download: {model_name}", file=sys.stderr)
model = whisper.load_model(model_name)
- # Wait a moment for the progress thread to finish
- time.sleep(0.5)
+ # Stop progress monitoring
+ stop_event.set()
+
+ # Wait for progress thread to finish
+ if progress_thread and progress_thread.is_alive():
+ progress_thread.join(timeout=1)
# Get final file info
final_size = 0
if os.path.exists(model_file):
final_size = os.path.getsize(model_file)
- print(f"Download completed: {model_name} ({final_size} bytes)", file=sys.stderr)
-
- # Send final progress update
- final_progress = {
- "type": "progress",
+ # Send completion signal
+ completion_data = {
+ "type": "complete",
"model": model_name,
"downloaded_bytes": final_size,
"total_bytes": expected_size,
- "percentage": 100,
- "speed_mbps": 0
+ "percentage": 100
}
- print(f"PROGRESS:{json.dumps(final_progress)}", file=sys.stderr)
+ print(f"PROGRESS:{json.dumps(completion_data)}", file=sys.stderr)
return {
"model": model_name,
@@ -203,7 +204,7 @@ def download_model(model_name="base"):
}
except KeyboardInterrupt:
- print(f"Download interrupted by user", file=sys.stderr)
+ stop_event.set()
return {
"model": model_name,
"downloaded": False,
@@ -211,18 +212,13 @@ def download_model(model_name="base"):
"success": False
}
except Exception as e:
- print(f"Error downloading model: {e}", file=sys.stderr)
+ stop_event.set()
return {
"model": model_name,
"downloaded": False,
"error": str(e),
"success": False
}
- finally:
- # Cleanup: let the progress thread finish naturally
- if progress_thread and progress_thread.is_alive():
- # Give the progress thread a moment to finish
- time.sleep(0.5)
def check_model_status(model_name="base"):
"""Check if a model is already downloaded"""
@@ -272,8 +268,6 @@ def list_models():
def delete_model(model_name="base"):
"""Delete a downloaded Whisper model"""
try:
- print(f"Deleting Whisper model: {model_name}", file=sys.stderr)
-
cache_dir = os.path.expanduser("~/.cache/whisper")
model_url = whisper._MODELS[model_name]
model_file = os.path.join(cache_dir, os.path.basename(model_url))
@@ -281,7 +275,6 @@ def delete_model(model_name="base"):
if os.path.exists(model_file):
file_size = os.path.getsize(model_file)
os.remove(model_file)
- print(f"Model {model_name} deleted successfully ({file_size} bytes freed)", file=sys.stderr)
return {
"model": model_name,
"deleted": True,
@@ -290,7 +283,6 @@ def delete_model(model_name="base"):
"success": True
}
else:
- print(f"Model {model_name} not found, nothing to delete", file=sys.stderr)
return {
"model": model_name,
"deleted": False,
@@ -298,7 +290,6 @@ def delete_model(model_name="base"):
"success": False
}
except Exception as e:
- print(f"Error deleting model: {e}", file=sys.stderr)
return {
"model": model_name,
"deleted": False,
@@ -332,7 +323,6 @@ def transcribe_audio(audio_path, model_name="base", language=None):
}
except Exception as e:
- print(f"Transcription error: {e}", file=sys.stderr)
return {
"error": str(e),
"success": False
@@ -397,4 +387,4 @@ def main():
sys.exit(1)
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
\ No newline at end of file