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: scope private model verification
altic-dev116475ebdab3
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 5008d781..59625035 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -3068,6 +3068,28 @@ final class SettingsStore: ObservableObject {}}+ /// Stored verification fingerprints per private model ID. Provider-level fingerprints remain+ /// for backward compatibility, while this map allows Dictation and Edit Mode to use different+ /// installed models without invalidating each other.+ var verifiedPrivateAIModelFingerprints: [String: String] {+ get {+ guard let data = self.defaults.data(forKey: Keys.verifiedPrivateAIModelFingerprints),+ let decoded = try? JSONDecoder().decode([String: String].self, from: data)+ else {+ return [:]+ }+ return decoded+ }+ set {+ objectWillChange.send()+ if let encoded = try? JSONEncoder().encode(newValue) {+ self.defaults.set(encoded, forKey: Keys.verifiedPrivateAIModelFingerprints)+ } else {+ self.defaults.removeObject(forKey: Keys.verifiedPrivateAIModelFingerprints)+ }+ }+ }+// MARK: - Stats Settings/// User's typing speed in words per minute (for time saved calculation)@@ -5264,6 +5286,7 @@ private extension SettingsStore {static let providerAPIKeyIdentifiers = "ProviderAPIKeyIdentifiers"static let savedProviders = "SavedProviders"static let verifiedProviderFingerprints = "VerifiedProviderFingerprints"+ static let verifiedPrivateAIModelFingerprints = "VerifiedPrivateAIModelFingerprints"static let shareAnonymousAnalytics = "ShareAnonymousAnalytics"static let privateAIInterestCaptured = "PrivateAIProviderInterestCaptured"static let hotkeyShortcutKey = "HotkeyShortcutKey"diff --git a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swiftindex 3163f30c..454ef6c4 100644--- a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift+++ b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift@@ -26,9 +26,15 @@ enum PrivateAIProviderPromptFormat {guard PrivateFeatures.privateAIProvider else { return nil }let key = self.providerKey(for: PrivateAIProviderFeature.shared.providerID)let modelID = PrivateAIModelRegistry.canonicalModelID(for: selectedModelID) ?? selectedModelID+ let expectedFingerprint = PrivateAIProviderFeature.verificationFingerprint(for: modelID)guard let model = PrivateAIModelRegistry.model(id: modelID),PrivateAIIntegrationService.isModelInstalled(model),- settings.verifiedProviderFingerprints[key] == PrivateAIProviderFeature.verificationFingerprint(for: modelID)+ self.hasStoredVerification(+ for: modelID,+ providerKey: key,+ expectedFingerprint: expectedFingerprint,+ settings: settings+ )else {return nil}@@ -36,6 +42,16 @@ enum PrivateAIProviderPromptFormat {return modelID}+ static func hasStoredVerification(+ for modelID: String,+ providerKey: String,+ expectedFingerprint: String,+ settings: SettingsStore = .shared+ ) -> Bool {+ settings.verifiedPrivateAIModelFingerprints[modelID] == expectedFingerprint ||+ settings.verifiedProviderFingerprints[providerKey] == expectedFingerprint+ }+private static func isSoleStoredVerifiedProvider(settings: SettingsStore) -> Bool {let key = self.providerKey(for: PrivateAIProviderFeature.shared.providerID)let fingerprints = settings.verifiedProviderFingerprintsdiff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swiftindex 08a869b1..b9b1ce5c 100644--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift@@ -384,9 +384,13 @@ final class AIEnhancementSettingsViewModel: ObservableObject {let status = try await PrivateAIIntegrationService.shared.loadModel(currentModel)switch status.state {case .ready:+ let fingerprint = self.privateAIFingerprint(for: currentModel.id)var fingerprints = self.settings.verifiedProviderFingerprints- fingerprints[key] = self.privateAIFingerprint(for: currentModel.id)+ fingerprints[key] = fingerprintself.settings.verifiedProviderFingerprints = fingerprints+ var modelFingerprints = self.settings.verifiedPrivateAIModelFingerprints+ modelFingerprints[currentModel.id] = fingerprint+ self.settings.verifiedPrivateAIModelFingerprints = modelFingerprintsself.selectedModelByProvider[key] = currentModel.idself.settings.selectedModelByProvider = self.selectedModelByProviderself.selectProviderForUse(providerID)@@ -415,6 +419,13 @@ final class AIEnhancementSettingsViewModel: ObservableObject {func resetVerification(for providerID: String) {let key = self.providerKey(for: providerID)self.settings.verifiedProviderFingerprints.removeValue(forKey: key)+ if providerID == PrivateAIProviderFeature.shared.providerID {+ let selectedModelID = self.settings.selectedModelByProvider[key]+ ?? PrivateAIIntegrationService.configuredModelID+ if let modelID = PrivateAIModelRegistry.canonicalModelID(for: selectedModelID) {+ self.settings.verifiedPrivateAIModelFingerprints.removeValue(forKey: modelID)+ }+ }self.updateConnectionStatus(.unknown, for: providerID)self.refreshProviderItems()}diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex 72b45111..4c17f1cb 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -1078,9 +1078,7 @@ extension AIEnhancementSettingsView {}private func isPrivateAIModelVerified(_ model: PrivateAIRegisteredModel) -> Bool {- guard PrivateAIIntegrationService.isModelInstalled(model) else { return false }- let key = self.viewModel.providerKey(for: PrivateAIProviderFeature.shared.providerID)- return self.viewModel.settings.verifiedProviderFingerprints[key] == PrivateAIProviderFeature.verificationFingerprint(for: model.id)+ PrivateAIProviderPromptFormat.verifiedModelID(for: model.id, settings: self.viewModel.settings) != nil}private func privateAIModelStatus(diff --git a/Sources/Fluid/UI/OnboardingAIEnhancementStepView.swift b/Sources/Fluid/UI/OnboardingAIEnhancementStepView.swiftindex 9eb070b6..1ded51aa 100644--- a/Sources/Fluid/UI/OnboardingAIEnhancementStepView.swift+++ b/Sources/Fluid/UI/OnboardingAIEnhancementStepView.swift@@ -1291,8 +1291,10 @@ struct OnboardingAIEnhancementStepView: View {self.settings.selectedModelByProvider = selectedModelByProvidervar fingerprints = self.settings.verifiedProviderFingerprints- fingerprints[providerKey] = PrivateAIProviderFeature.verificationFingerprint(for: model.id)+ let fingerprint = PrivateAIProviderFeature.verificationFingerprint(for: model.id)+ fingerprints[providerKey] = fingerprintself.settings.verifiedProviderFingerprints = fingerprints+ self.settings.verifiedPrivateAIModelFingerprints[model.id] = fingerprintself.settings.selectedProviderID = providerIDself.settings.setDictationPromptSelection(.privateAI)@@ -1307,6 +1309,7 @@ struct OnboardingAIEnhancementStepView: View {var fingerprints = self.settings.verifiedProviderFingerprintsfingerprints.removeValue(forKey: providerKey)self.settings.verifiedProviderFingerprints = fingerprints+ self.settings.verifiedPrivateAIModelFingerprints = [:]if self.settings.selectedProviderID == providerID {self.settings.selectedProviderID = ""diff --git a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swiftindex 2a2ffe14..f0610df7 100644--- a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift+++ b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift@@ -52,6 +52,7 @@ final class DictationE2ETests: XCTestCase {private let privateAIContextDefaultMigratedTo4KKey = "PrivateAIProviderContextDefaultMigratedTo4K"private let verifiedProviderFingerprintsKey = "VerifiedProviderFingerprints"+ private let verifiedPrivateAIModelFingerprintsKey = "VerifiedPrivateAIModelFingerprints"private var punctuationFormattingDefaultsKeys: [String] {[@@ -1490,6 +1491,63 @@ final class DictationE2ETests: XCTestCase {}}+ func testPrivateModelVerificationIsIndependentFromProviderSelection() {+ self.withRestoredDefaults(+ keys: [self.verifiedProviderFingerprintsKey, self.verifiedPrivateAIModelFingerprintsKey]+ ) {+ let settings = SettingsStore.shared+ settings.verifiedProviderFingerprints = ["private": "model-a-fingerprint"]+ settings.verifiedPrivateAIModelFingerprints = [:]++ XCTAssertFalse(+ PrivateAIProviderPromptFormat.hasStoredVerification(+ for: "model-b",+ providerKey: "private",+ expectedFingerprint: "model-b-fingerprint",+ settings: settings+ )+ )++ settings.verifiedPrivateAIModelFingerprints = ["model-b": "model-b-fingerprint"]++ XCTAssertTrue(+ PrivateAIProviderPromptFormat.hasStoredVerification(+ for: "model-b",+ providerKey: "private",+ expectedFingerprint: "model-b-fingerprint",+ settings: settings+ )+ )+ XCTAssertFalse(+ PrivateAIProviderPromptFormat.hasStoredVerification(+ for: "model-b",+ providerKey: "private",+ expectedFingerprint: "stale-fingerprint",+ settings: settings+ )+ )+ }+ }++ func testPrivateModelVerificationAcceptsLegacyProviderFingerprint() {+ self.withRestoredDefaults(+ keys: [self.verifiedProviderFingerprintsKey, self.verifiedPrivateAIModelFingerprintsKey]+ ) {+ let settings = SettingsStore.shared+ settings.verifiedPrivateAIModelFingerprints = [:]+ settings.verifiedProviderFingerprints = ["private": "legacy-fingerprint"]++ XCTAssertTrue(+ PrivateAIProviderPromptFormat.hasStoredVerification(+ for: "model-a",+ providerKey: "private",+ expectedFingerprint: "legacy-fingerprint",+ settings: settings+ )+ )+ }+ }+func testUnavailableSelectedProviderClearsSelection() {self.withProviderSettingsRestored {let settings = SettingsStore.shared