Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

fix: clarify model preparation progress

altic-dev6567a7b809da
diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swift
index 122e105f..6c5fbae6 100644
--- a/Sources/Fluid/Services/ASRService.swift
+++ b/Sources/Fluid/Services/ASRService.swift
@@ -93,6 +93,7 @@ final class ASRService: ObservableObject {
@Published private(set) var isCancellingModelPreparation: Bool = false
@Published var modelsExistOnDisk: Bool = false
@Published var downloadProgress: Double? = nil
+ @Published var modelPreparationPhase: ModelPreparationPhase? = nil
@Published var downloadingModelId: String? = nil // Tracks which model is currently being downloaded
@Published private(set) var isCancellingModelDownload: Bool = false
@Published private(set) var isDictionaryTrainingCaptureActive: Bool = false
@@ -114,13 +115,33 @@ final class ASRService: ObservableObject {
if self.isAsrReady { return "Model ready" }
if self.isCancellingModelPreparation { return "Cancelling model preparation..." }
if self.isCancellingModelDownload { return "Cancelling model download..." }
- if self.downloadingModelId != nil { return "Downloading model..." }
- if self.isDownloadingModel { return "Downloading model..." }
- if self.isLoadingModel { return "Loading model into memory..." }
+ if self.downloadingModelId != nil || self.isDownloadingModel || self.isLoadingModel {
+ return self.modelPreparationStatusText
+ }
if self.modelsExistOnDisk { return "Model cached, needs loading" }
return "Model not downloaded"
}
+ var modelPreparationStatusText: String {
+ switch self.modelPreparationPhase {
+ case .preparingDownload:
+ return "Preparing download..."
+ case .downloading:
+ if let progress = self.downloadProgress {
+ return "Downloading \(Int(progress * 100))%"
+ }
+ return "Downloading model..."
+ case .optimizing:
+ return "Optimizing model..."
+ case .loading:
+ return "Loading voice engine..."
+ case nil:
+ if self.isDownloadingModel { return "Preparing model..." }
+ if self.isLoadingModel { return "Loading voice engine..." }
+ return "Preparing model..."
+ }
+ }
+
// MARK: - Transcription Provider (Settable)
/// Cached providers to avoid re-instantiation
@@ -413,10 +434,10 @@ final class ASRService: ObservableObject {
let operationID = UUID()
let provider = self.getProvider(for: model)
- let progressRelay = ModelPreparationProgressRelay(progressHandler)
self.modelDownloadOperationID = operationID
self.downloadingModelId = model.id
- self.downloadProgress = 0.0
+ self.downloadProgress = nil
+ self.modelPreparationPhase = .preparingDownload
self.isCancellingModelDownload = false
let task = Task { @MainActor [weak self] in
@@ -424,7 +445,6 @@ final class ASRService: ObservableObject {
do {
DebugLogger.shared.info("Downloading model: \(model.displayName) (without changing active selection)", source: "ASRService")
try await provider.prepare(progressHandler: { progress in
- let clamped = max(0.0, min(1.0, progress))
Task { @MainActor in
guard
self.modelDownloadOperationID == operationID,
@@ -432,9 +452,11 @@ final class ASRService: ObservableObject {
else {
return
}
- let monotonic = max(self.downloadProgress ?? 0.0, clamped)
- self.downloadProgress = monotonic
- progressRelay.report(monotonic)
+ self.applyModelPreparationProgress(
+ progress,
+ updatesActiveModelState: false,
+ externalProgressHandler: progressHandler
+ )
}
})
try Task.checkCancellation()
@@ -461,6 +483,7 @@ final class ASRService: ObservableObject {
self.modelDownloadOperationID = nil
self.downloadingModelId = nil
self.downloadProgress = nil
+ self.modelPreparationPhase = nil
self.isCancellingModelDownload = false
}
}
@@ -483,6 +506,7 @@ final class ASRService: ObservableObject {
self.isDownloadingModel = false
if !self.hasActiveModelDownload {
self.downloadProgress = nil
+ self.modelPreparationPhase = nil
}
self.hasCompletedFirstTranscription = false // Reset warm-up state when switching models
let retiringTask = self.ensureReadyTask
@@ -1480,6 +1504,7 @@ final class ASRService: ObservableObject {
self.hasCompletedFirstTranscription = true
DispatchQueue.main.async {
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
DebugLogger.shared.info("✅ Model warmed up - first transcription completed", source: "ASRService")
}
}
@@ -1526,6 +1551,7 @@ final class ASRService: ObservableObject {
self.hasCompletedFirstTranscription = true
DispatchQueue.main.async {
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
DebugLogger.shared.info("⚠️ First transcription failed - clearing loading state", source: "ASRService")
}
}
@@ -1573,6 +1599,7 @@ final class ASRService: ObservableObject {
if !self.hasCompletedFirstTranscription {
self.hasCompletedFirstTranscription = true
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
}
let cleanedText = ASRService.applyCustomDictionary(ASRService.removeFillerWords(result.text))
@@ -1614,6 +1641,7 @@ final class ASRService: ObservableObject {
if !self.hasCompletedFirstTranscription {
self.hasCompletedFirstTranscription = true
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
}
let cleanedText = ASRService.applyCustomDictionary(ASRService.removeFillerWords(result.text))
@@ -2764,11 +2792,13 @@ final class ASRService: ObservableObject {
self.isLoadingModel = true
self.isDownloadingModel = false
self.downloadProgress = nil
+ self.modelPreparationPhase = .loading
DebugLogger.shared.info("📦 LOADING cached model into memory...", source: "ASRService")
} else {
self.isDownloadingModel = true
self.isLoadingModel = false
- self.downloadProgress = 0.0
+ self.downloadProgress = nil
+ self.modelPreparationPhase = .preparingDownload
DebugLogger.shared.info("⬇️ DOWNLOADING model...", source: "ASRService")
}
@@ -2783,20 +2813,15 @@ final class ASRService: ObservableObject {
guard
let self,
self.ensureReadyOperationID == operationID,
- self.isDownloadingModel,
!self.isCancellingModelPreparation
else {
return
}
- let clamped = max(0.0, min(1.0, progress))
- let monotonic = max(self.downloadProgress ?? 0.0, clamped)
- self.downloadProgress = monotonic
- externalProgressHandler?(monotonic)
- if clamped >= 1.0 {
- self.isDownloadingModel = false
- self.isLoadingModel = true
- self.downloadProgress = nil
- }
+ self.applyModelPreparationProgress(
+ progress,
+ updatesActiveModelState: true,
+ externalProgressHandler: externalProgressHandler
+ )
}
}
)
@@ -2809,9 +2834,11 @@ final class ASRService: ObservableObject {
// Keep isLoadingModel true until first transcription completes (for large models that need warm-up)
if !self.hasCompletedFirstTranscription {
self.isLoadingModel = true
+ self.modelPreparationPhase = .loading
DebugLogger.shared.info("⏳ Model loaded, waiting for first transcription to complete...", source: "ASRService")
} else {
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
}
self.downloadProgress = nil
self.modelsExistOnDisk = true
@@ -2841,6 +2868,7 @@ final class ASRService: ObservableObject {
self.isDownloadingModel = false
self.isLoadingModel = false
self.downloadProgress = nil
+ self.modelPreparationPhase = nil
self.modelsExistOnDisk = provider.modelsExistOnDisk()
self.isCancellingModelPreparation = false
}
@@ -2856,6 +2884,7 @@ final class ASRService: ObservableObject {
self.isDownloadingModel = false
self.isLoadingModel = false
self.downloadProgress = nil
+ self.modelPreparationPhase = nil
self.modelsExistOnDisk = provider.modelsExistOnDisk()
self.isCancellingModelPreparation = false
}
@@ -2867,15 +2896,54 @@ final class ASRService: ObservableObject {
self.isDownloadingModel = false
self.isLoadingModel = false
self.downloadProgress = nil
+ self.modelPreparationPhase = nil
}
throw error
}
}
+ private func applyModelPreparationProgress(
+ _ progress: ModelPreparationProgress,
+ updatesActiveModelState: Bool,
+ externalProgressHandler: ((Double) -> Void)?
+ ) {
+ switch progress.phase {
+ case .preparingDownload:
+ self.downloadProgress = nil
+ if updatesActiveModelState {
+ self.isDownloadingModel = true
+ self.isLoadingModel = false
+ }
+ case .downloading:
+ self.downloadProgress = progress.fractionCompleted
+ if updatesActiveModelState {
+ self.isDownloadingModel = true
+ self.isLoadingModel = false
+ }
+ if let fraction = progress.fractionCompleted {
+ externalProgressHandler?(fraction)
+ }
+ case .optimizing:
+ self.downloadProgress = nil
+ if updatesActiveModelState {
+ self.isDownloadingModel = true
+ self.isLoadingModel = false
+ }
+ case .loading:
+ self.downloadProgress = nil
+ if updatesActiveModelState {
+ self.isDownloadingModel = false
+ self.isLoadingModel = true
+ }
+ }
+
+ self.modelPreparationPhase = progress.phase
+ }
+
private func prepareProviderWithRecovery(
provider: TranscriptionProvider,
modelsAlreadyCached: Bool,
- progressHandler: @escaping (Double) -> Void
+ progressHandler: @escaping (ModelPreparationProgress) -> Void
) async throws {
let start = Date()
var firstError: Error?
@@ -3147,6 +3215,7 @@ final class ASRService: ObservableObject {
self.hasCompletedFirstTranscription = true
DispatchQueue.main.async {
self.isLoadingModel = false
+ self.modelPreparationPhase = nil
DebugLogger.shared.info("✅ Model warmed up - first streaming transcription completed", source: "ASRService")
}
}
diff --git a/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift b/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
index 8ad245ba..781217f4 100644
--- a/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
+++ b/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
@@ -38,7 +38,7 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// MARK: - Lifecycle
- func prepare(progressHandler: ((Double) -> Void)?) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)?) async throws {
try Task.checkCancellation()
let locale = self.selectedSpeechLocale()
let localeID = self.normalizedIdentifier(for: locale)
@@ -72,11 +72,12 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
if !isInstalled {
DebugLogger.shared.info("Downloading speech model for locale: \(localeID)", source: "AppleSpeechAnalyzerProvider")
if let downloader = try await AssetInventory.assetInstallationRequest(supporting: [transcriber]) {
+ progressHandler?(.preparingDownload)
// Report progress periodically during download
let progress = downloader.progress
let progressTask = Task {
while !Task.isCancelled, !progress.isFinished, !progress.isCancelled {
- progressHandler?(progress.fractionCompleted)
+ progressHandler?(.downloading(progress.fractionCompleted))
try? await Task.sleep(for: .milliseconds(100))
}
}
@@ -99,11 +100,12 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
throw error
}
try Task.checkCancellation()
- progressHandler?(1.0)
+ progressHandler?(.optimizing)
}
}
// 4. Get the best available audio format for conversion
+ progressHandler?(.loading)
self.analyzerFormat = await SpeechAnalyzer.bestAvailableAudioFormat(compatibleWith: [transcriber])
try Task.checkCancellation()
self.converter = BufferConverter()
diff --git a/Sources/Fluid/Services/AppleSpeechProvider.swift b/Sources/Fluid/Services/AppleSpeechProvider.swift
index 1538c287..7af21624 100644
--- a/Sources/Fluid/Services/AppleSpeechProvider.swift
+++ b/Sources/Fluid/Services/AppleSpeechProvider.swift
@@ -29,7 +29,7 @@ final class AppleSpeechProvider: TranscriptionProvider {
// MARK: - Lifecycle
- func prepare(progressHandler: ((Double) -> Void)?) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)?) async throws {
// 1. Request Authorization
let status = await self.requestAuthorization()
diff --git a/Sources/Fluid/Services/ExternalCoreMLTranscriptionProvider.swift b/Sources/Fluid/Services/ExternalCoreMLTranscriptionProvider.swift
index ebf8876a..ec7a8b80 100644
--- a/Sources/Fluid/Services/ExternalCoreMLTranscriptionProvider.swift
+++ b/Sources/Fluid/Services/ExternalCoreMLTranscriptionProvider.swift
@@ -22,7 +22,7 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
self.modelOverride = modelOverride
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
try Task.checkCancellation()
guard self.isReady == false else { return }
@@ -71,6 +71,7 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
"ExternalCoreML: loading Cohere models [splitCompute=\(computeSummary), maxAudioSamples=\(self.loadedManifest?.maxAudioSamples ?? 0)]",
source: "ExternalCoreML"
)
+ progressHandler?(.loading)
try await manager.loadModels(from: directory, computeConfiguration: spec.computeConfiguration)
try Task.checkCancellation()
self.cohereManager = manager
@@ -225,7 +226,7 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
for model: SettingsStore.SpeechModel,
spec: ExternalCoreMLASRModelSpec,
at directory: URL,
- progressHandler: ((Double) -> Void)?
+ progressHandler: ((ModelPreparationProgress) -> Void)?
) async throws {
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
let isManagedDirectory = spec.isAppManagedArtifactsDirectory(directory)
@@ -278,6 +279,7 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
"ExternalCoreML: downloading missing artifacts from \(owner)/\(repo)",
source: "ExternalCoreML"
)
+ progressHandler?(.preparingDownload)
let downloader = HuggingFaceModelDownloader(
owner: owner,
@@ -292,10 +294,11 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
)
// The managed-cache stamp below is part of installation truth. Keep the transfer
// below 100% until structural validation succeeds and that stamp is persisted.
- progressHandler?(min(progress, 0.999))
+ progressHandler?(.downloading(progress))
}
try Task.checkCancellation()
+ progressHandler?(.optimizing)
do {
try spec.validateArtifactsOrThrow(at: directory)
} catch {
@@ -306,7 +309,6 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
spec.persistArtifactBundleStamp(at: directory)
}
SettingsStore.shared.setExternalCoreMLArtifactsDirectory(directory, for: model)
- progressHandler?(1.0)
}
private static func artifactsDirectory(
@@ -453,7 +455,7 @@ final class ExternalCoreMLTranscriptionProvider: TranscriptionProvider {
init(modelOverride: SettingsStore.SpeechModel? = nil) {}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
throw NSError(
domain: "ExternalCoreMLTranscriptionProvider",
code: -1,
diff --git a/Sources/Fluid/Services/FluidAudioProvider.swift b/Sources/Fluid/Services/FluidAudioProvider.swift
index aada1486..32ad31a3 100644
--- a/Sources/Fluid/Services/FluidAudioProvider.swift
+++ b/Sources/Fluid/Services/FluidAudioProvider.swift
@@ -32,7 +32,7 @@ final class FluidAudioProvider: TranscriptionProvider {
self.configureWordBoosting = configureWordBoosting
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
try Task.checkCancellation()
guard self.isReady == false else { return }
@@ -55,15 +55,17 @@ final class FluidAudioProvider: TranscriptionProvider {
try FileManager.default.removeItem(at: modelCacheDirectory)
}
let progressRelay = ModelPreparationProgressRelay(progressHandler)
- progressRelay.report(0.0)
+ progressRelay.report(.preparingDownload)
let fluidAudioProgressHandler: DownloadUtils.ProgressHandler = { progress in
switch progress.phase {
case .listing:
- progressRelay.report(0.0)
+ progressRelay.report(.preparingDownload)
case .downloading:
- progressRelay.report(max(0.0, min(1.0, progress.fractionCompleted * 2.0)))
+ // FluidAudio reserves 0.0-0.5 for transfer bytes. Show percent only for that
+ // real download phase, not for later Core ML work.
+ progressRelay.report(.downloading(progress.fractionCompleted / 0.5))
case .compiling:
- progressRelay.report(1.0)
+ progressRelay.report(.optimizing)
}
}
@@ -151,7 +153,7 @@ final class FluidAudioProvider: TranscriptionProvider {
try Task.checkCancellation()
self.isReady = true
- progressRelay.report(1.0)
+ progressRelay.report(.loading)
DebugLogger.shared.info(
"FluidAudioProvider: Models ready [isWordBoostingActive=\(self.isWordBoostingActive), terms=\(self.boostedVocabularyTermsCount)]",
source: "FluidAudioProvider"
@@ -366,7 +368,7 @@ final class FluidAudioProvider: TranscriptionProvider {
// Intel stub - parameter ignored
}
- func prepare(progressHandler: ((Double) -> Void)?) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)?) async throws {
throw NSError(
domain: "FluidAudioProvider",
code: -1,
diff --git a/Sources/Fluid/Services/NemotronProvider.swift b/Sources/Fluid/Services/NemotronProvider.swift
index 64e07da3..05a3dabb 100644
--- a/Sources/Fluid/Services/NemotronProvider.swift
+++ b/Sources/Fluid/Services/NemotronProvider.swift
@@ -112,7 +112,7 @@ final class NemotronProvider: TranscriptionProvider {
return true
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
try Task.checkCancellation()
guard self.isReady == false else { return }
guard let dir = self.cacheDirectory else {
@@ -144,6 +144,7 @@ final class NemotronProvider: TranscriptionProvider {
"Nemotron: artifacts missing; downloading from \(self.repositoryOwner)/\(self.repositoryName)",
source: "Nemotron"
)
+ progressHandler?(.preparingDownload)
let downloader = HuggingFaceModelDownloader(
owner: self.repositoryOwner,
repo: self.repositoryName,
@@ -153,18 +154,19 @@ final class NemotronProvider: TranscriptionProvider {
}
)
try await downloader.ensureModelsPresent(at: dir) { progress, _ in
- progressHandler?(min(progress, 0.999))
+ progressHandler?(.downloading(progress))
}
try Task.checkCancellation()
guard self.modelsExistOnDisk() else {
throw Self.makeError("Nemotron artifacts incomplete after download at \(dir.path).")
}
- progressHandler?(1.0)
+ progressHandler?(.optimizing)
}
self.maxTranscriptionSamples = Self.loadMaxAudioSamples(from: dir) ?? self.maxTranscriptionSamples
let manager: NemotronStreamingAsrManager
do {
+ progressHandler?(.loading)
manager = try await self.loadManager(modelDirectory: dir, computeUnits: .cpuAndNeuralEngine)
} catch {
guard Self.shouldRetryWithoutNeuralEngine(error) else {
@@ -667,7 +669,7 @@ final class NemotronProvider: TranscriptionProvider {
self.mode = mode
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
throw Self.makeError("Nemotron requires Apple Silicon.")
}
diff --git a/Sources/Fluid/Services/ParakeetRealtimeProvider.swift b/Sources/Fluid/Services/ParakeetRealtimeProvider.swift
index b63a92ab..b3e7afc2 100644
--- a/Sources/Fluid/Services/ParakeetRealtimeProvider.swift
+++ b/Sources/Fluid/Services/ParakeetRealtimeProvider.swift
@@ -20,7 +20,7 @@ final class ParakeetRealtimeProvider: TranscriptionProvider {
self.chunkSize = chunkSize
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
try Task.checkCancellation()
guard self.isReady == false else { return }
@@ -65,11 +65,13 @@ final class ParakeetRealtimeProvider: TranscriptionProvider {
try await engine.loadModelsFromHuggingFace(progressHandler: { progress in
switch progress.phase {
case .listing:
- progressRelay.report(0.0)
+ progressRelay.report(.preparingDownload)
case .downloading:
- progressRelay.report(max(0.0, min(1.0, progress.fractionCompleted * 2.0)))
+ // FluidAudio reserves 0.0-0.5 for transfer bytes. Show percent only for that
+ // real download phase, not for later Core ML work.
+ progressRelay.report(.downloading(progress.fractionCompleted / 0.5))
case .compiling:
- progressRelay.report(1.0)
+ progressRelay.report(.optimizing)
}
})
} catch {
@@ -262,7 +264,7 @@ final class ParakeetRealtimeProvider: TranscriptionProvider {
var isAvailable: Bool { false }
var isReady: Bool { false }
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
throw NSError(domain: "ParakeetRealtimeProvider", code: -1, userInfo: [NSLocalizedDescriptionKey: "Parakeet Flash requires Apple Silicon"])
}
diff --git a/Sources/Fluid/Services/TranscriptionProvider.swift b/Sources/Fluid/Services/TranscriptionProvider.swift
index 77405d3b..188f735f 100644
--- a/Sources/Fluid/Services/TranscriptionProvider.swift
+++ b/Sources/Fluid/Services/TranscriptionProvider.swift
@@ -1,15 +1,40 @@
import Foundation
+enum ModelPreparationPhase: Sendable, Equatable {
+ case preparingDownload
+ case downloading
+ case optimizing
+ case loading
+}
+
+struct ModelPreparationProgress: Sendable, Equatable {
+ let phase: ModelPreparationPhase
+ let fractionCompleted: Double?
+
+ init(phase: ModelPreparationPhase, fractionCompleted: Double? = nil) {
+ self.phase = phase
+ self.fractionCompleted = fractionCompleted.map { max(0.0, min(1.0, $0)) }
+ }
+
+ static let preparingDownload = ModelPreparationProgress(phase: .preparingDownload)
+ static let optimizing = ModelPreparationProgress(phase: .optimizing)
+ static let loading = ModelPreparationProgress(phase: .loading)
+
+ static func downloading(_ fractionCompleted: Double) -> ModelPreparationProgress {
+ ModelPreparationProgress(phase: .downloading, fractionCompleted: fractionCompleted)
+ }
+}
+
/// Bridges provider callbacks into dependencies whose progress handlers are `@Sendable`.
/// The callback is immutable; callers remain responsible for hopping to their UI actor.
final class ModelPreparationProgressRelay: @unchecked Sendable {
- private let handler: ((Double) -> Void)?
+ private let handler: ((ModelPreparationProgress) -> Void)?
- init(_ handler: ((Double) -> Void)?) {
+ init(_ handler: ((ModelPreparationProgress) -> Void)?) {
self.handler = handler
}
- func report(_ progress: Double) {
+ func report(_ progress: ModelPreparationProgress) {
self.handler?(progress)
}
}
@@ -42,9 +67,8 @@ protocol TranscriptionProvider {
/// Whether models are downloaded and ready
var isReady: Bool { get }
- /// Download/prepare models for transcription
- /// - Parameter progressHandler: Optional callback for download progress (0.0 to 1.0)
- func prepare(progressHandler: ((Double) -> Void)?) async throws
+ /// Download/prepare models for transcription.
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)?) async throws
/// Transcribe audio samples
/// - Parameter samples: 16kHz mono PCM float samples
diff --git a/Sources/Fluid/Services/WhisperProvider.swift b/Sources/Fluid/Services/WhisperProvider.swift
index ad20794c..948b003c 100644
--- a/Sources/Fluid/Services/WhisperProvider.swift
+++ b/Sources/Fluid/Services/WhisperProvider.swift
@@ -74,7 +74,7 @@ final class WhisperProvider: TranscriptionProvider {
return expectedBytes.map { sizeBytes == $0 } ?? false
}
- func prepare(progressHandler: ((Double) -> Void)? = nil) async throws {
+ func prepare(progressHandler: ((ModelPreparationProgress) -> Void)? = nil) async throws {
try Task.checkCancellation()
// CRITICAL: Capture the target model at start to use consistently throughout this method.
// This prevents race conditions where SettingsStore could change after await points.
@@ -109,7 +109,10 @@ final class WhisperProvider: TranscriptionProvider {
// Download model if not present
if !FileManager.default.fileExists(atPath: self.modelURL.path) {
DebugLogger.shared.info("WhisperProvider: Downloading Whisper model...", source: "WhisperProvider")
- try await self.downloadModel(progressHandler: progressHandler)
+ progressHandler?(.preparingDownload)
+ try await self.downloadModel { progress in
+ progressHandler?(.downloading(progress))
+ }
}
guard self.isModelFileValid(at: self.modelURL) else {
@@ -150,6 +153,7 @@ final class WhisperProvider: TranscriptionProvider {
// Load the model
DebugLogger.shared.info("WhisperProvider: Loading Whisper model...", source: "WhisperProvider")
+ progressHandler?(.loading)
self.whisper = Whisper(fromFileURL: self.modelURL)
try Task.checkCancellation()
diff --git a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
index 789e6427..131ffc5d 100644
--- a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
+++ b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift
@@ -369,11 +369,19 @@ extension VoiceEngineSettingsView {
Text("Cancelling…")
.font(self.theme.typography.bodySmall)
.foregroundStyle(self.voiceEngineSecondaryText)
- } else {
- ProgressView(value: self.viewModel.downloadProgress)
+ } else if self.viewModel.asr.modelPreparationPhase == .downloading,
+ let progress = self.viewModel.asr.downloadProgress
+ {
+ ProgressView(value: progress)
.progressViewStyle(.linear)
.frame(width: 90)
- Text("\(Int(self.viewModel.downloadProgress * 100))%")
+ Text("\(Int(progress * 100))%")
+ .font(self.theme.typography.bodySmall)
+ .foregroundStyle(self.voiceEngineSecondaryText)
+ } else {
+ ProgressView()
+ .controlSize(.mini)
+ Text(self.viewModel.asr.modelPreparationStatusText)
.font(self.theme.typography.bodySmall)
.foregroundStyle(self.voiceEngineSecondaryText)
}
@@ -401,7 +409,10 @@ extension VoiceEngineSettingsView {
Text("Cancelling…")
.font(self.theme.typography.bodySmall)
.foregroundStyle(self.voiceEngineSecondaryText)
- } else if let progress = self.viewModel.asr.downloadProgress, self.viewModel.asr.isDownloadingModel {
+ } else if self.viewModel.asr.isDownloadingModel,
+ self.viewModel.asr.modelPreparationPhase == .downloading,
+ let progress = self.viewModel.asr.downloadProgress
+ {
ProgressView(value: progress)
.progressViewStyle(.linear)
.frame(width: 90)
@@ -411,7 +422,7 @@ extension VoiceEngineSettingsView {
} else {
ProgressView()
.controlSize(.mini)
- Text(self.viewModel.asr.isLoadingModel ? "Loading…" : "Downloading…")
+ Text(self.viewModel.asr.modelPreparationStatusText)
.font(self.theme.typography.bodySmall)
.foregroundStyle(self.voiceEngineSecondaryText)
}
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index 1ed5edd2..ec0d85b3 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -1567,10 +1567,12 @@ struct OnboardingFlowView: View {
.frame(width: 608)
if self.isModelPreparationInProgress {
- Label("First setup can take a few minutes. Too long? Cancel and retry.", systemImage: "clock.arrow.circlepath")
+ Label("Initial preparation can take a while to get your Mac ready for near-instant transcription.", systemImage: "clock.arrow.circlepath")
.font(self.theme.typography.captionStrong)
.foregroundStyle(Color.white.opacity(0.58))
.labelStyle(.titleAndIcon)
+ .lineLimit(1)
+ .minimumScaleFactor(0.86)
.padding(.horizontal, 10)
.padding(.vertical, 5)
.background(
@@ -2167,12 +2169,15 @@ struct OnboardingFlowView: View {
.font(self.theme.typography.captionStrong)
.foregroundStyle(Color.white.opacity(0.62))
}
- } else if self.asr.isDownloadingModel, let progress = self.asr.downloadProgress {
+ } else if self.asr.isDownloadingModel,
+ self.asr.modelPreparationPhase == .downloading,
+ let progress = self.asr.downloadProgress
+ {
ProgressView(value: progress)
.tint(FluidOnboardingLandingColors.blue)
HStack(spacing: 6) {
- Text("Downloading \(Int(progress * 100))%")
+ Text(self.asr.modelPreparationStatusText)
.font(self.theme.typography.captionStrong)
.foregroundStyle(Color.white.opacity(0.56))
.lineLimit(1)
@@ -2187,7 +2192,7 @@ struct OnboardingFlowView: View {
Text(
isUninstalling
? "Deleting..."
- : "Loading model..."
+ : self.asr.modelPreparationStatusText
)
.font(self.theme.typography.captionStrong)
.foregroundStyle(Color.white.opacity(0.62))