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

feat(onboarding): add apple speech options

altic-dev0826c1bb02b3
diff --git a/Sources/Fluid/Persistence/BackupService.swift b/Sources/Fluid/Persistence/BackupService.swift
index 024148e3..5662adc5 100644
--- a/Sources/Fluid/Persistence/BackupService.swift
+++ b/Sources/Fluid/Persistence/BackupService.swift
@@ -16,6 +16,7 @@ struct SettingsBackupPayload: Codable, Equatable {
let selectedSpeechModel: SettingsStore.SpeechModel
let selectedCohereLanguage: SettingsStore.CohereLanguage
let selectedNemotronLanguage: SettingsStore.NemotronLanguage?
+ let selectedAppleSpeechLocaleIdentifier: String?
let hotkeyShortcut: HotkeyShortcut
let promptModeHotkeyShortcut: HotkeyShortcut
let promptModeShortcutEnabled: Bool
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 6996547d..12f43681 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -1994,6 +1994,28 @@ final class SettingsStore: ObservableObject {
}
}
+ var selectedAppleSpeechLocaleIdentifier: String {
+ get {
+ let stored = self.defaults.string(forKey: Keys.selectedAppleSpeechLocaleIdentifier)?
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ if let stored, !stored.isEmpty {
+ return stored
+ }
+ return Locale.current.identifier.replacingOccurrences(of: "_", with: "-")
+ }
+ set {
+ objectWillChange.send()
+ let normalized = newValue
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ .replacingOccurrences(of: "_", with: "-")
+ self.defaults.set(normalized.isEmpty ? "en-US" : normalized, forKey: Keys.selectedAppleSpeechLocaleIdentifier)
+ }
+ }
+
+ var selectedAppleSpeechLocale: Locale {
+ Locale(identifier: self.selectedAppleSpeechLocaleIdentifier)
+ }
+
var shouldShowOnboarding: Bool {
!self.onboardingCompleted
}
@@ -2478,6 +2500,7 @@ final class SettingsStore: ObservableObject {
selectedSpeechModel: self.selectedSpeechModel,
selectedCohereLanguage: self.selectedCohereLanguage,
selectedNemotronLanguage: self.selectedNemotronLanguage,
+ selectedAppleSpeechLocaleIdentifier: self.selectedAppleSpeechLocaleIdentifier,
hotkeyShortcut: self.hotkeyShortcut,
promptModeHotkeyShortcut: self.promptModeHotkeyShortcut,
promptModeShortcutEnabled: self.promptModeShortcutEnabled,
@@ -2563,6 +2586,9 @@ final class SettingsStore: ObservableObject {
if let selectedNemotronLanguage = payload.selectedNemotronLanguage {
self.selectedNemotronLanguage = selectedNemotronLanguage
}
+ if let selectedAppleSpeechLocaleIdentifier = payload.selectedAppleSpeechLocaleIdentifier {
+ self.selectedAppleSpeechLocaleIdentifier = selectedAppleSpeechLocaleIdentifier
+ }
self.hotkeyShortcut = payload.hotkeyShortcut
self.promptModeHotkeyShortcut = payload.promptModeHotkeyShortcut
self.promptModeShortcutEnabled = payload.promptModeShortcutEnabled
@@ -3467,7 +3493,7 @@ final class SettingsStore: ObservableObject {
case .nemotronStreaming320:
return "NVIDIA Nemotron 3.5 streaming-capable transcription. Supports 40 language-locales with auto or manual language selection."
case .appleSpeech:
- return "Built-in macOS speech recognition. No download required."
+ return "Built-in macOS speech recognition. No model download required."
case .appleSpeechAnalyzer:
return "Advanced and modern on-device recognition for newer macOS devices."
case .whisperTiny:
@@ -4001,6 +4027,7 @@ private extension SettingsStore {
static let selectedSpeechModel = "SelectedSpeechModel"
static let selectedCohereLanguage = "SelectedCohereLanguage"
static let selectedNemotronLanguage = "SelectedNemotronLanguage"
+ static let selectedAppleSpeechLocaleIdentifier = "SelectedAppleSpeechLocaleIdentifier"
static let externalCoreMLArtifactsDirectories = "ExternalCoreMLArtifactsDirectories"
// Overlay Position
diff --git a/Sources/Fluid/Persistence/VoiceEngineLanguageCatalog.swift b/Sources/Fluid/Persistence/VoiceEngineLanguageCatalog.swift
index 1da43214..1eedf738 100644
--- a/Sources/Fluid/Persistence/VoiceEngineLanguageCatalog.swift
+++ b/Sources/Fluid/Persistence/VoiceEngineLanguageCatalog.swift
@@ -1,4 +1,7 @@
import Foundation
+#if canImport(Speech)
+import Speech
+#endif
import SwiftWhisper
struct VoiceEngineLanguage: Identifiable, Equatable {
@@ -15,6 +18,7 @@ struct VoiceEngineLanguage: Identifiable, Equatable {
struct VoiceEngineLanguageRoute: Identifiable, Equatable {
enum LanguageBinding: Equatable {
case automatic
+ case appleSpeech(localeIdentifier: String)
case cohere(SettingsStore.CohereLanguage)
case nemotron(SettingsStore.NemotronLanguage)
case whisper(languageCode: String)
@@ -23,6 +27,8 @@ struct VoiceEngineLanguageRoute: Identifiable, Equatable {
switch self {
case .automatic:
return "auto"
+ case let .appleSpeech(localeIdentifier):
+ return "apple-\(localeIdentifier)"
case let .cohere(language):
return "cohere-\(language.rawValue)"
case let .nemotron(language):
@@ -114,6 +120,8 @@ enum VoiceEngineLanguageCatalog {
switch route.binding {
case .automatic, .whisper:
break
+ case let .appleSpeech(localeIdentifier):
+ settings.selectedAppleSpeechLocaleIdentifier = localeIdentifier
case let .cohere(language):
settings.selectedCohereLanguage = language
case let .nemotron(language):
@@ -148,6 +156,14 @@ enum VoiceEngineLanguageCatalog {
}
}
+ if let appleSpeechAnalyzerLocale = Self.appleSpeechAnalyzerLocaleIdentifier(for: language.id) {
+ routes.append(Self.route(language, .appleSpeechAnalyzer, .appleSpeech(localeIdentifier: appleSpeechAnalyzerLocale)))
+ }
+
+ if let appleSpeechLegacyLocale = Self.appleSpeechLegacyLocaleIdentifier(for: language.id) {
+ routes.append(Self.route(language, .appleSpeech, .appleSpeech(localeIdentifier: appleSpeechLegacyLocale)))
+ }
+
return routes
}
@@ -171,6 +187,19 @@ enum VoiceEngineLanguageCatalog {
self.whisperLanguageCodeMap[languageID]
}
+ private static func appleSpeechAnalyzerLocaleIdentifier(for languageID: String) -> String? {
+ self.appleSpeechAnalyzerLocaleMap[languageID]
+ }
+
+ private static func appleSpeechLegacyLocaleIdentifier(for languageID: String) -> String? {
+ guard let preferredLocales = self.appleSpeechLegacyLocalePreferences[languageID] else {
+ return nil
+ }
+
+ let supportedLocales = self.legacyAppleLocaleIDs
+ return preferredLocales.first { supportedLocales.contains($0) }
+ }
+
private static let popularLanguageIDs: Set<String> = [
"en",
"es",
@@ -259,6 +288,66 @@ enum VoiceEngineLanguageCatalog {
.whisperSmall,
]
+ private static let appleSpeechAnalyzerLocaleMap: [String: String] = [
+ "de": "de-DE",
+ "en": "en-US",
+ "es": "es-US",
+ "fr": "fr-FR",
+ "it": "it-IT",
+ "ja": "ja-JP",
+ "ko": "ko-KR",
+ "pt": "pt-BR",
+ "zh": "zh-CN",
+ ]
+
+ private static let appleSpeechLegacyLocalePreferences: [String: [String]] = [
+ "ar": ["ar-SA"],
+ "ca": ["ca-ES"],
+ "cs": ["cs-CZ"],
+ "da": ["da-DK"],
+ "de": ["de-DE", "de-AT", "de-CH"],
+ "el": ["el-GR"],
+ "en": ["en-US", "en-GB", "en-CA", "en-AU", "en-IN"],
+ "es": ["es-US", "es-ES", "es-MX", "es-419"],
+ "fi": ["fi-FI"],
+ "fr": ["fr-FR", "fr-CA", "fr-BE", "fr-CH"],
+ "he": ["he-IL"],
+ "hi": ["hi-IN"],
+ "hr": ["hr-HR"],
+ "hu": ["hu-HU"],
+ "id": ["id-ID"],
+ "it": ["it-IT", "it-CH"],
+ "ja": ["ja-JP"],
+ "ko": ["ko-KR"],
+ "ms": ["ms-MY"],
+ "nl": ["nl-NL", "nl-BE"],
+ "no": ["nb-NO"],
+ "pl": ["pl-PL"],
+ "pt": ["pt-BR", "pt-PT"],
+ "ro": ["ro-RO"],
+ "ru": ["ru-RU"],
+ "sk": ["sk-SK"],
+ "sv": ["sv-SE"],
+ "th": ["th-TH"],
+ "tr": ["tr-TR"],
+ "uk": ["uk-UA"],
+ "vi": ["vi-VN"],
+ "zh": ["zh-CN", "zh-TW", "zh-HK"],
+ ]
+
+ private static let legacyAppleLocaleIDs: Set<String> = {
+ #if canImport(Speech)
+ if #available(macOS 10.15, *) {
+ return Set(SFSpeechRecognizer.supportedLocales().map { Self.normalizedLocaleIdentifier($0.identifier) })
+ }
+ #endif
+ return []
+ }()
+
+ private static func normalizedLocaleIdentifier(_ identifier: String) -> String {
+ identifier.replacingOccurrences(of: "_", with: "-")
+ }
+
private static let whisperLanguageCodeMap: [String: String] = {
let supportedCodes = Set(
WhisperLanguage.allCases
diff --git a/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift b/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
index 0835d902..7f0a2a60 100644
--- a/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
+++ b/Sources/Fluid/Services/AppleSpeechAnalyzerProvider.swift
@@ -26,6 +26,7 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
/// The required audio format for the analyzer
private var analyzerFormat: AVAudioFormat?
+ private var preparedLocale: Locale?
/// Thread-safe cache for model installation status.
/// Protected by `_cacheQueue` for thread-safe access from both sync and async contexts.
@@ -37,9 +38,12 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// MARK: - Lifecycle
func prepare(progressHandler: ((Double) -> Void)?) async throws {
+ let locale = self.selectedSpeechLocale()
+ let localeID = self.normalizedIdentifier(for: locale)
+
// 1. Create a transcriber to check locale support and download if needed
let transcriber = SpeechTranscriber(
- locale: Locale.current,
+ locale: locale,
transcriptionOptions: [],
reportingOptions: [],
attributeOptions: []
@@ -47,8 +51,7 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// 2. Check if locale is supported
let supportedLocales = await SpeechTranscriber.supportedLocales
- let currentLocaleID = Locale.current.identifier(.bcp47)
- let isSupported = supportedLocales.map { $0.identifier(.bcp47) }.contains(currentLocaleID)
+ let isSupported = supportedLocales.map { self.normalizedIdentifier(for: $0) }.contains(localeID)
guard isSupported else {
throw NSError(
@@ -60,10 +63,10 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// 3. Check if model is installed, download if needed
let installedLocales = await SpeechTranscriber.installedLocales
- let isInstalled = installedLocales.map { $0.identifier(.bcp47) }.contains(currentLocaleID)
+ let isInstalled = installedLocales.map { self.normalizedIdentifier(for: $0) }.contains(localeID)
if !isInstalled {
- DebugLogger.shared.info("Downloading speech model for locale: \(currentLocaleID)", source: "AppleSpeechAnalyzerProvider")
+ DebugLogger.shared.info("Downloading speech model for locale: \(localeID)", source: "AppleSpeechAnalyzerProvider")
if let downloader = try await AssetInventory.assetInstallationRequest(supporting: [transcriber]) {
// Report progress periodically during download
let progress = downloader.progress
@@ -80,6 +83,7 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// 4. Get the best available audio format for conversion
self.analyzerFormat = await SpeechAnalyzer.bestAvailableAudioFormat(compatibleWith: [transcriber])
self.converter = BufferConverter()
+ self.preparedLocale = locale
self.isReady = true
@@ -100,6 +104,7 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
self._cacheQueue.sync { self._modelsInstalledCache = false }
self.isReady = false
+ self.preparedLocale = nil
}
/// Returns the cached result of whether models are installed (thread-safe).
@@ -122,13 +127,13 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
/// - Returns: `true` if the current locale's speech model is installed on disk, `false` otherwise.
func refreshModelsExistOnDiskAsync() async -> Bool {
let installedLocales = await SpeechTranscriber.installedLocales
- let currentLocaleID = Locale.current.identifier(.bcp47)
- let isInstalled = installedLocales.map { $0.identifier(.bcp47) }.contains(currentLocaleID)
+ let localeID = self.normalizedIdentifier(for: self.selectedSpeechLocale())
+ let isInstalled = installedLocales.map { self.normalizedIdentifier(for: $0) }.contains(localeID)
self._cacheQueue.sync { self._modelsInstalledCache = isInstalled }
DebugLogger.shared.debug(
- "AppleSpeechAnalyzer: Model installed check - locale: \(currentLocaleID), installed: \(isInstalled)",
+ "AppleSpeechAnalyzer: Model installed check - locale: \(localeID), installed: \(isInstalled)",
source: "AppleSpeechAnalyzerProvider"
)
@@ -147,10 +152,11 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
}
DebugLogger.shared.debug("AppleSpeechAnalyzer: Starting transcription with \(samples.count) samples", source: "AppleSpeechAnalyzerProvider")
+ let transcriptionLocale = self.preparedLocale ?? self.selectedSpeechLocale()
// 1. Create a FRESH transcriber for this transcription
let freshTranscriber = SpeechTranscriber(
- locale: Locale.current,
+ locale: transcriptionLocale,
transcriptionOptions: [],
reportingOptions: [],
attributeOptions: []
@@ -235,6 +241,14 @@ final class AppleSpeechAnalyzerProvider: TranscriptionProvider {
// MARK: - Helpers
+ private func selectedSpeechLocale() -> Locale {
+ SettingsStore.shared.selectedAppleSpeechLocale
+ }
+
+ private func normalizedIdentifier(for locale: Locale) -> String {
+ locale.identifier(.bcp47).replacingOccurrences(of: "_", with: "-")
+ }
+
/// Converts raw [Float] samples (16kHz mono) to AVAudioPCMBuffer
private func createPCMBuffer(from samples: [Float]) -> AVAudioPCMBuffer? {
guard let format = AVAudioFormat(
diff --git a/Sources/Fluid/Services/AppleSpeechProvider.swift b/Sources/Fluid/Services/AppleSpeechProvider.swift
index af32948a..1538c287 100644
--- a/Sources/Fluid/Services/AppleSpeechProvider.swift
+++ b/Sources/Fluid/Services/AppleSpeechProvider.swift
@@ -5,7 +5,7 @@ import Speech
// MARK: - Apple Speech Provider
/// A TranscriptionProvider that uses Apple's native SFSpeechRecognizer.
-/// This runs strictly on-device, requires no downloads, and has 0 memory footprint when idle.
+/// This uses Apple's system speech path and lets macOS choose local or online recognition.
final class AppleSpeechProvider: TranscriptionProvider {
var name: String { "Apple Speech (Legacy)" }
@@ -19,12 +19,12 @@ final class AppleSpeechProvider: TranscriptionProvider {
private(set) var isReady: Bool = false
/// The recognizer instance. We intentionally re-create it if the locale changes,
- /// but for now we default to the system locale.
+ /// using the language selected in Voice Engine/onboarding.
private var recognizer: SFSpeechRecognizer?
+ private var recognizerLocaleIdentifier: String?
init() {
- // Initialize with user's current locale
- self.recognizer = SFSpeechRecognizer(locale: Locale.current)
+ _ = self.updateRecognizerIfNeeded()
}
// MARK: - Lifecycle
@@ -69,11 +69,8 @@ final class AppleSpeechProvider: TranscriptionProvider {
throw NSError(domain: "AppleSpeechProvider", code: 4, userInfo: [NSLocalizedDescriptionKey: "Failed to create audio buffer"])
}
- // 2. Ensure recognizer exists
- if self.recognizer == nil {
- self.recognizer = SFSpeechRecognizer(locale: Locale.current)
- }
- guard let recognizer = self.recognizer else {
+ // 2. Ensure recognizer exists for the selected speech language
+ guard let recognizer = self.updateRecognizerIfNeeded() else {
throw NSError(domain: "AppleSpeechProvider", code: 5, userInfo: [NSLocalizedDescriptionKey: "Failed to initialize SFSpeechRecognizer"])
}
@@ -84,7 +81,7 @@ final class AppleSpeechProvider: TranscriptionProvider {
// 3. Create Request
let request = SFSpeechAudioBufferRecognitionRequest()
request.shouldReportPartialResults = false // We want the final result for this chunk
- request.requiresOnDeviceRecognition = true // Enforce strict privacy/offline
+ request.requiresOnDeviceRecognition = false // Allow macOS to use the best available Apple speech path.
request.append(buffer)
request.endAudio() // Signal that this buffer is the complete utterance for this request
@@ -117,6 +114,16 @@ final class AppleSpeechProvider: TranscriptionProvider {
// MARK: - Helpers
+ private func updateRecognizerIfNeeded() -> SFSpeechRecognizer? {
+ let locale = SettingsStore.shared.selectedAppleSpeechLocale
+ let localeIdentifier = locale.identifier.replacingOccurrences(of: "_", with: "-")
+ if self.recognizer == nil || self.recognizerLocaleIdentifier != localeIdentifier {
+ self.recognizer = SFSpeechRecognizer(locale: locale)
+ self.recognizerLocaleIdentifier = localeIdentifier
+ }
+ return self.recognizer
+ }
+
/// Converts raw [Float] samples (16kHz mono) to AVAudioPCMBuffer
private func createPCMBuffer(from samples: [Float]) -> AVAudioPCMBuffer? {
// Define format: 16kHz, Mono, Float32 (standard for ML/ASR)
diff --git a/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift
index 246fe202..74f53109 100644
--- a/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift
+++ b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift
@@ -194,7 +194,7 @@ final class VoiceEngineSettingsViewModel: ObservableObject {
let model = self.settings.selectedSpeechModel
switch model {
case .appleSpeech:
- return "Apple Speech (Legacy) uses on-device recognition. No download required, works on Intel and Apple Silicon."
+ return "Apple Speech (Legacy) uses built-in macOS speech recognition. No model download required, works on Intel and Apple Silicon."
case .appleSpeechAnalyzer:
return "Apple Speech uses advanced on-device recognition with fast, accurate transcription. Requires macOS 26+."
case .parakeetTDT:
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index 33c26e13..2ab3fe6f 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -731,11 +731,37 @@ struct OnboardingFlowView: View {
self.selectedLanguageRoutes.first
}
- private var otherModelRoutes: [VoiceEngineLanguageRoute] {
- guard let primaryDisplayedModelRoute else {
- return []
+ private var defaultDisplayedModelRoutes: [VoiceEngineLanguageRoute] {
+ var routes: [VoiceEngineLanguageRoute] = []
+ if let primaryDisplayedModelRoute {
+ routes.append(primaryDisplayedModelRoute)
+ }
+ if let builtInRoute = self.defaultBuiltInModelRoute,
+ !routes.contains(where: { $0.id == builtInRoute.id })
+ {
+ routes.append(builtInRoute)
+ }
+ return routes
+ }
+
+ private var defaultBuiltInModelRoute: VoiceEngineLanguageRoute? {
+ guard self.selectedOnboardingLanguage.id == "en" else {
+ return nil
}
- return self.selectedLanguageRoutes.filter { $0.id != primaryDisplayedModelRoute.id }
+
+ return self.selectedLanguageRoutes.first { route in
+ switch route.model {
+ case .appleSpeech, .appleSpeechAnalyzer:
+ return true
+ default:
+ return false
+ }
+ }
+ }
+
+ private var otherModelRoutes: [VoiceEngineLanguageRoute] {
+ let defaultRouteIDs = Set(self.defaultDisplayedModelRoutes.map(\.id))
+ return self.selectedLanguageRoutes.filter { !defaultRouteIDs.contains($0.id) }
}
private var recommendedOnboardingModel: SettingsStore.SpeechModel {
@@ -1448,7 +1474,7 @@ struct OnboardingFlowView: View {
let availableRouteHeight = max(CGFloat(306), proxy.size.height - 410)
let routeGridHeight = self.isShowingOtherModelRoutes
? min(CGFloat(500), max(CGFloat(330), availableRouteHeight))
- : min(CGFloat(324), availableRouteHeight)
+ : min(CGFloat(340), availableRouteHeight)
ZStack {
FluidOnboardingLandingBackdrop(glowCenter: self.landingGlowCenter)
@@ -1492,8 +1518,15 @@ struct OnboardingFlowView: View {
ScrollView(.vertical, showsIndicators: self.isShowingOtherModelRoutes) {
VStack(spacing: 10) {
- if let primaryDisplayedModelRoute {
- self.onboardingRouteCard(for: primaryDisplayedModelRoute)
+ let defaultRoutes = self.defaultDisplayedModelRoutes
+ if defaultRoutes.count == 1, let route = defaultRoutes.first {
+ self.onboardingRouteCard(for: route)
+ } else if !defaultRoutes.isEmpty {
+ HStack(spacing: 16) {
+ ForEach(defaultRoutes) { route in
+ self.onboardingRouteCard(for: route)
+ }
+ }
}
if !self.otherModelRoutes.isEmpty {
@@ -1836,7 +1869,11 @@ struct OnboardingFlowView: View {
}
private func isOnboardingModelDownloaded(_ model: SettingsStore.SpeechModel) -> Bool {
- model.isInstalled || (self.isOnboardingModelSelected(model) && (self.asr.isAsrReady || self.asr.modelsExistOnDisk))
+ self.isOnboardingModelBundledOrInstalled(model) || (self.isOnboardingModelSelected(model) && (self.asr.isAsrReady || self.asr.modelsExistOnDisk))
+ }
+
+ private func isOnboardingModelBundledOrInstalled(_ model: SettingsStore.SpeechModel) -> Bool {
+ model == .appleSpeech || (model != .appleSpeechAnalyzer && model.isInstalled)
}
private func isPreparingOnboardingModel(_ model: SettingsStore.SpeechModel) -> Bool {
@@ -1906,11 +1943,12 @@ struct OnboardingFlowView: View {
let isSelected = self.isOnboardingRouteSelected(route)
let isHovered = enablesHover && self.hoveredModelRouteID == route.id
let isRouteActiveInSettings = self.isRouteSelectedInSettings(route)
- let isDownloaded = model.isInstalled || (isRouteActiveInSettings && (self.asr.isAsrReady || self.asr.modelsExistOnDisk))
+ let isDownloaded = self.isOnboardingModelBundledOrInstalled(model) || (isRouteActiveInSettings && (self.asr.isAsrReady || self.asr.modelsExistOnDisk))
let isPreparing = self.preparingModelRouteID == route.id || (isRouteActiveInSettings && (self.asr.isDownloadingModel || (self.asr.isLoadingModel && !self.asr.isAsrReady)))
let isReady = self.isOnboardingRouteReady(route)
let isUninstalling = self.uninstallingModelRouteID == route.id
let areModelActionsBlocked = self.asr.isRunning || self.uninstallingModelRouteID != nil || self.preparingModelRouteID != nil || isPreparing || self.isModelPreparationInProgress
+ let isBuiltInAppleModel = model == .appleSpeech || model == .appleSpeechAnalyzer
let shape = RoundedRectangle(cornerRadius: 14, style: .continuous)
let cardFill = isHovered
? Color(red: 0.042, green: 0.052, blue: 0.074)
@@ -1985,6 +2023,17 @@ struct OnboardingFlowView: View {
}
}
.frame(height: 42, alignment: .center)
+ } else if isDownloaded, isBuiltInAppleModel {
+ self.onboardingModelActionButton(
+ id: "\(route.id)-activate",
+ title: self.onboardingModelActionButtonTitle(isPreparing: false, isDownloaded: true, isReady: isReady),
+ systemImage: isReady ? "checkmark" : "bolt.fill",
+ tone: .primary,
+ width: nil,
+ isDisabled: areModelActionsBlocked || isReady
+ ) {
+ self.prepareOnboardingRoute(route)
+ }
} else if isDownloaded {
HStack(spacing: 8) {
self.onboardingModelActionButton(
@@ -2393,6 +2442,8 @@ struct OnboardingFlowView: View {
switch route.binding {
case .automatic, .whisper:
return self.settings.onboardingSelectedLanguageID == route.language.id
+ case let .appleSpeech(localeIdentifier):
+ return self.settings.selectedAppleSpeechLocaleIdentifier == localeIdentifier
case let .cohere(language):
return self.settings.selectedCohereLanguage == language
case let .nemotron(language):
@@ -2408,6 +2459,8 @@ struct OnboardingFlowView: View {
switch route.binding {
case .automatic, .whisper:
return true
+ case let .appleSpeech(localeIdentifier):
+ return self.settings.selectedAppleSpeechLocaleIdentifier == localeIdentifier
case let .cohere(language):
return self.settings.selectedCohereLanguage == language
case let .nemotron(language):
@@ -2417,6 +2470,7 @@ struct OnboardingFlowView: View {
private func selectOnboardingRoute(_ route: VoiceEngineLanguageRoute) {
let oldModel = self.settings.selectedSpeechModel
+ let oldAppleSpeechLocaleIdentifier = self.settings.selectedAppleSpeechLocaleIdentifier
let oldCohereLanguage = self.settings.selectedCohereLanguage
let oldNemotronLanguage = self.settings.selectedNemotronLanguage
@@ -2427,6 +2481,8 @@ struct OnboardingFlowView: View {
switch route.binding {
case .automatic, .whisper:
languageChanged = false
+ case .appleSpeech:
+ languageChanged = oldAppleSpeechLocaleIdentifier != self.settings.selectedAppleSpeechLocaleIdentifier
case .cohere:
languageChanged = oldCohereLanguage != self.settings.selectedCohereLanguage
case .nemotron: